Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.
authorRyan C. Gordon <icculus@icculus.org>
Fri, 15 Jun 2007 07:21:01 +0000
changeset 2123 9a48d1a6fbec
parent 2122 b15ffacb66d3
child 2124 11ab270f5106
Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.
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++ */