Mercurial > sdl-ios-xcode

changeset 3965:19d708301fab SDL-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure __inline__ isn't defined before #defining it, since some compilers (like Sun Studio) have this as a predefined macro. Fixes Bugzilla #434.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 15 Jun 2007 07:19:05 +0000
parents 3dc92ff218dd
children c0de2aac0a8c
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 06:57:31 2007 +0000
+++ b/include/begin_code.h	Fri Jun 15 07:19:05 2007 +0000
@@ -123,7 +123,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++ */