From 40e8b6906154cfccf44832f7bd9055ffa24e9618 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 6 Jan 2010 20:17:35 +0000
Subject: [PATCH] Merged r4710:4711 from branches/SDL-1.2: Mac OS X SDL_stdlib
 qsort build fixes.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404367
---
 src/stdlib/SDL_qsort.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/stdlib/SDL_qsort.c b/src/stdlib/SDL_qsort.c
index 5f268d2b5..b91be69ca 100644
--- 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