Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.

--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402355

Merged r3075:3076 from branches/SDL-1.2: Careful with inline #define.
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402355
dd54d0a6 · Ryan C. Gordon · d8e14b0c · dd54d0a6
Commit dd54d0a6 authored Jun 15, 2007 by Ryan C. Gordon
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

begin_code.h include/begin_code.h +2 -0

No files found.
--- a/include/begin_code.h
+++ b/include/begin_code.h
@@ -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++ */