1.1 --- a/src/stdlib/SDL_qsort.c	Wed Jan 06 07:45:58 2010 +0000
     1.2 +++ b/src/stdlib/SDL_qsort.c	Wed Jan 06 20:17:35 2010 +0000
     1.3 @@ -50,11 +50,29 @@
     1.4  */
     1.5  #include "SDL_stdinc.h"
     1.6  
     1.7 +#ifdef assert
     1.8 +#undef assert
     1.9 +#endif
    1.10  #define assert(X)
    1.11 +#ifdef malloc
    1.12 +#undef malloc
    1.13 +#endif
    1.14  #define malloc	SDL_malloc
    1.15 +#ifdef free
    1.16 +#undef free
    1.17 +#endif
    1.18  #define free	SDL_free
    1.19 +#ifdef memcpy
    1.20 +#undef memcpy
    1.21 +#endif
    1.22  #define memcpy	SDL_memcpy
    1.23 +#ifdef memmove
    1.24 +#undef memmove
    1.25 +#endif
    1.26  #define memmove	SDL_memmove
    1.27 +#ifdef qsort
    1.28 +#undef qsort
    1.29 +#endif
    1.30  #define qsort	SDL_qsort
    1.31  
    1.32