# HG changeset patch # User Ryan C. Gordon # Date 1181891945 0 # Node ID 19d708301fab9f849d17f0494134df0c1aa199c5 # Parent 3dc92ff218dd40e701d2b3e85f7781c89d2596ef Make sure __inline__ isn't defined before #defining it, since some compilers (like Sun Studio) have this as a predefined macro. Fixes Bugzilla #434. diff -r 3dc92ff218dd -r 19d708301fab include/begin_code.h --- 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++ */