Merged r4710:4711 from branches/SDL-1.2: Mac OS X SDL_stdlib qsort bu…

…ild fixes.
libsdl-org · Jan 6, 2010 · 5afeb03 · 5afeb03
1 parent 20aac07
commit 5afeb03
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/stdlib/SDL_qsort.c b/src/stdlib/SDL_qsort.c
@@ -50,11 +50,29 @@
 */
 #include "SDL_stdinc.h"
 
+#ifdef assert
+#undef assert
+#endif
 #define assert(X)
+#ifdef malloc
+#undef malloc
+#endif
 #define malloc	SDL_malloc
+#ifdef free
+#undef free
+#endif
 #define free	SDL_free
+#ifdef memcpy
+#undef memcpy
+#endif
 #define memcpy	SDL_memcpy
+#ifdef memmove
+#undef memmove
+#endif
 #define memmove	SDL_memmove
+#ifdef qsort
+#undef qsort
+#endif
 #define qsort	SDL_qsort