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 21239a48d1a6fbec
parent 2122 b15ffacb66d3
child 2124 11ab270f5106
Merged r3075:3076 from branches/SDL-1.2: Careful with __inline__ #define.
include/begin_code.h
     1.1 --- a/include/begin_code.h	Fri Jun 15 05:43:05 2007 +0000
     1.2 +++ b/include/begin_code.h	Fri Jun 15 07:21:01 2007 +0000
     1.3 @@ -120,7 +120,9 @@
     1.4  #define SDL_INLINE_OKAY
     1.5  #else
     1.6  #if !defined(__MRC__) && !defined(_SGI_SOURCE)
     1.7 +#ifndef __inline__
     1.8  #define __inline__ inline
     1.9 +#endif
    1.10  #define SDL_INLINE_OKAY
    1.11  #endif /* Not a funky compiler */
    1.12  #endif /* Visual C++ */