Mercurial > sdl-ios-xcode
comparison include/begin_code.h @ 2123:9a48d1a6fbec
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 | 542c78b6fb12 |
children | 99210400e8b9 |
comparison
equal
deleted
inserted
replaced
2122:b15ffacb66d3 | 2123:9a48d1a6fbec |
---|---|
118 #define __inline__ __inline | 118 #define __inline__ __inline |
119 #endif | 119 #endif |
120 #define SDL_INLINE_OKAY | 120 #define SDL_INLINE_OKAY |
121 #else | 121 #else |
122 #if !defined(__MRC__) && !defined(_SGI_SOURCE) | 122 #if !defined(__MRC__) && !defined(_SGI_SOURCE) |
123 #ifndef __inline__ | |
123 #define __inline__ inline | 124 #define __inline__ inline |
125 #endif | |
124 #define SDL_INLINE_OKAY | 126 #define SDL_INLINE_OKAY |
125 #endif /* Not a funky compiler */ | 127 #endif /* Not a funky compiler */ |
126 #endif /* Visual C++ */ | 128 #endif /* Visual C++ */ |
127 #endif /* GNU C */ | 129 #endif /* GNU C */ |
128 #endif /* SDL_INLINE_OKAY */ | 130 #endif /* SDL_INLINE_OKAY */ |