# HG changeset patch # User Edgar Simo # Date 1217524536 0 # Node ID 034440120c389fae3d5dc2f48082dc82197c882c # Parent 57ea8810b5f0338898a45c016db5d48026b9c509 Converted some functions to SDL_mem*. diff -r 57ea8810b5f0 -r 034440120c38 src/joystick/win32/SDL_dxjoystick.c --- a/src/joystick/win32/SDL_dxjoystick.c Thu Jul 31 17:11:36 2008 +0000 +++ b/src/joystick/win32/SDL_dxjoystick.c Thu Jul 31 17:15:36 2008 +0000 @@ -178,7 +178,7 @@ static BOOL CALLBACK EnumJoysticksCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext) { - memcpy(&SYS_Joystick[SYS_NumJoysticks], pdidInstance, + SDL_memcpy(&SYS_Joystick[SYS_NumJoysticks], pdidInstance, sizeof(DIDEVICEINSTANCE)); SYS_NumJoysticks++; @@ -208,7 +208,7 @@ LPDIRECTINPUTDEVICE device; DIPROPDWORD dipdw; - ZeroMemory(&dipdw, sizeof(DIPROPDWORD)); + SDL_memset(&dipdw, 0, sizeof(DIPROPDWORD)); dipdw.diph.dwSize = sizeof(DIPROPDWORD); dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER); @@ -220,7 +220,7 @@ SDL_OutOfMemory(); return (-1); } - ZeroMemory(joystick->hwdata, sizeof(struct joystick_hwdata)); + SDL_memset(joystick->hwdata, 0, sizeof(struct joystick_hwdata)); joystick->hwdata->buffered = 1; joystick->hwdata->Capabilities.dwSize = sizeof(DIDEVCAPS);