# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1181892061 0
# Node ID 9a48d1a6fbecfae1f27d7aa1a626675843b71f34
# Parent  b15ffacb66d3592fb1bce3549d06c0605ac97156
Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.

diff -r b15ffacb66d3 -r 9a48d1a6fbec include/begin_code.h
--- a/include/begin_code.h	Fri Jun 15 05:43:05 2007 +0000
+++ b/include/begin_code.h	Fri Jun 15 07:21:01 2007 +0000
@@ -120,7 +120,9 @@
 #define SDL_INLINE_OKAY
 #else
 #if !defined(__MRC__) && !defined(_SGI_SOURCE)
+#ifndef __inline__
 #define __inline__ inline
+#endif
 #define SDL_INLINE_OKAY
 #endif /* Not a funky compiler */
 #endif /* Visual C++ */