Mercurial > sdl-ios-xcode

changeset 2575:57ea8810b5f0 gsoc2008_force_feedback

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed some stray memcpy and free.
author Edgar Simo <bobbens@gmail.com>
date Thu, 31 Jul 2008 17:11:36 +0000
parents c1f07fdd1e2d
children 034440120c38
files src/haptic/win32/SDL_syshaptic.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/haptic/win32/SDL_syshaptic.c	Thu Jul 31 16:38:13 2008 +0000
+++ b/src/haptic/win32/SDL_syshaptic.c	Thu Jul 31 17:11:36 2008 +0000
@@ -166,7 +166,7 @@
 static BOOL CALLBACK
 EnumHapticsCallback(const DIDEVICEINSTANCE * pdidInstance, VOID * pContext)
 {
-   memcpy(&SDL_hapticlist[SDL_numhaptics].instance, pdidInstance,
+   SDL_memcpy(&SDL_hapticlist[SDL_numhaptics].instance, pdidInstance,
          sizeof(DIDEVICEINSTANCE));
    SDL_numhaptics++;
 
@@ -376,7 +376,7 @@
    IDirectInputDevice2_Release(haptic->hwdata->device);   
 creat_err:
    if (haptic->hwdata != NULL) {
-      free(haptic->hwdata);
+      SDL_free(haptic->hwdata);
       haptic->hwdata = NULL;                                              
    }
    return -1;