Mercurial > sdl-ios-xcode

changeset 2123:9a48d1a6fbec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 15 Jun 2007 07:21:01 +0000
parents b15ffacb66d3
children 11ab270f5106
files include/begin_code.h
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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++ */