Mercurial > sdl-ios-xcode
diff src/joystick/os2/SDL_sysjoystick.c @ 1336:3692456e7b0f
Use SDL_ prefixed versions of C library functions.
FIXME:
Change #include <stdlib.h> to #include "SDL_stdlib.h"
Change #include <string.h> to #include "SDL_string.h"
Make sure nothing else broke because of this...
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 07 Feb 2006 06:59:48 +0000 |
| parents | c9b51268668f |
| children | 604d73db6802 |
line wrap: on
line diff
--- a/src/joystick/os2/SDL_sysjoystick.c Mon Feb 06 17:28:04 2006 +0000 +++ b/src/joystick/os2/SDL_sysjoystick.c Tue Feb 07 06:59:48 2006 +0000 @@ -326,14 +326,14 @@ int i; /* Generic Counter */ /* allocate memory for system specific hardware data */ -joystick->hwdata = (struct joystick_hwdata *) malloc(sizeof(*joystick->hwdata)); +joystick->hwdata = (struct joystick_hwdata *) SDL_malloc(sizeof(*joystick->hwdata)); if (joystick->hwdata == NULL) { SDL_OutOfMemory(); return(-1); } /* Reset Hardware Data */ -memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); +SDL_memset(joystick->hwdata, 0, sizeof(*joystick->hwdata)); /* ShortCut Pointer */ index = joystick->index; @@ -517,7 +517,7 @@ if (joystick->hwdata != NULL) { /* free system specific hardware data */ - free(joystick->hwdata); + SDL_free(joystick->hwdata); } } @@ -602,7 +602,7 @@ char *joyenv; /* Pointer to tested character */ char tempnumber[5]; /* Temporary place to put numeric texts */ -joyenv = getenv("SDL_OS2_JOYSTICK"); +joyenv = SDL_getenv("SDL_OS2_JOYSTICK"); if (joyenv == NULL) return 0; /* Joystick Environment is defined! */ while (*joyenv==' ' && *joyenv!=0) joyenv++; /* jump spaces... */