Mercurial > sdl-ios-xcode
diff include/begin_code.h @ 1402:d910939febfa
Use consistent identifiers for the various platforms we support.
Make sure every source file includes SDL_config.h, so the proper system
headers are chosen.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 21 Feb 2006 08:46:50 +0000 |
| parents | 173c063d4f55 |
| children | 2422ca15ba42 |
line wrap: on
line diff
--- a/include/begin_code.h Tue Feb 21 08:34:45 2006 +0000 +++ b/include/begin_code.h Tue Feb 21 08:46:50 2006 +0000 @@ -31,11 +31,6 @@ #endif #define _begin_code_h -/* Make sure the correct platform symbols are defined */ -#if !defined(WIN32) && defined(_WIN32) -#define WIN32 -#endif /* Windows */ - /* Some compilers use a special export keyword */ #ifndef DECLSPEC # ifdef __BEOS__ @@ -45,7 +40,7 @@ # define DECLSPEC __declspec(export) # endif # else -# ifdef WIN32 +# ifdef __WIN32__ # ifdef __BORLANDC__ # ifdef BUILD_SDL # define DECLSPEC @@ -75,7 +70,7 @@ /* By default SDL uses the C calling convention */ #ifndef SDLCALL -#if defined(WIN32) && !defined(__GNUC__) +#if defined(__WIN32__) && !defined(__GNUC__) #define SDLCALL __cdecl #else #ifdef __OS2__ @@ -107,7 +102,7 @@ #pragma nopackwarning #endif #pragma pack(push,4) -#elif (defined(__MWERKS__) && defined(macintosh)) +#elif (defined(__MWERKS__) && defined(__MACOS__)) #pragma options align=mac68k4byte #pragma enumsalwaysint on #endif /* Compiler needs structure packing set */