Mercurial > sdl-ios-xcode
comparison include/SDL_stdinc.h @ 4697:a5c4ded0c979
Fix compile errors under Android toolchain. Seems to have the same issue as the NDS.
author | Paul Hunkin <paul@bieh.net> |
---|---|
date | Sun, 23 May 2010 15:10:18 +1200 |
parents | f7b03b6838cb |
children | 1f7ad083fd3c |
comparison
equal
deleted
inserted
replaced
4696:3a3e8fb1b6f4 | 4697:a5c4ded0c979 |
---|---|
165 SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); | 165 SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); |
166 SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); | 166 SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); |
167 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); | 167 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); |
168 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); | 168 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); |
169 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); | 169 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); |
170 #ifndef __NINTENDODS__ /* TODO: figure out why the following happens: | 170 #if !defined(__NINTENDODS__) && !defined(__ANDROID__) |
171 include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative | 171 /* TODO: figure out why the following happens: |
172 include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */ | 172 include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative |
173 include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */ | |
173 SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); | 174 SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); |
174 SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); | 175 SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); |
175 #endif | 176 #endif |
176 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ | 177 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ |
177 /** \endcond */ | 178 /** \endcond */ |
186 #pragma enumsalwaysint on | 187 #pragma enumsalwaysint on |
187 #endif | 188 #endif |
188 | 189 |
189 /** \cond */ | 190 /** \cond */ |
190 #ifndef DOXYGEN_SHOULD_IGNORE_THIS | 191 #ifndef DOXYGEN_SHOULD_IGNORE_THIS |
191 #ifndef __NINTENDODS__ /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ | 192 #if !defined(__NINTENDODS__) && !defined(__ANDROID__) |
193 /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ | |
192 typedef enum | 194 typedef enum |
193 { | 195 { |
194 DUMMY_ENUM_VALUE | 196 DUMMY_ENUM_VALUE |
195 } SDL_DUMMY_ENUM; | 197 } SDL_DUMMY_ENUM; |
196 | 198 |