Merged r4710:4711 from branches/SDL-1.2: Mac OS X SDL_stdlib qsort build fixes.
authorRyan C. Gordon <icculus@icculus.org>
Wed, 06 Jan 2010 20:17:35 +0000
changeset 3616 0aaa7f52d1c6
parent 3615 4a4371a7cd4f
child 3617 023aa9699baa
Merged r4710:4711 from branches/SDL-1.2: Mac OS X SDL_stdlib qsort build fixes.
src/stdlib/SDL_qsort.c
--- a/src/stdlib/SDL_qsort.c	Wed Jan 06 07:45:58 2010 +0000
+++ b/src/stdlib/SDL_qsort.c	Wed Jan 06 20:17:35 2010 +0000
@@ -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