comparison include/SDL_stdinc.h @ 4729:1f7ad083fd3c

Merged Paul's Google Summer of Code work from SDL-gsoc2010_android
author Sam Lantinga <slouken@libsdl.org>
date Sun, 22 Aug 2010 12:23:55 -0700
parents bff93336121e a5c4ded0c979
children 518d1679d2d0
comparison
equal deleted inserted replaced
4694:c24ba2cc9583 4729:1f7ad083fd3c
172 SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); 172 SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
173 SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); 173 SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
174 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); 174 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
175 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); 175 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
176 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); 176 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
177 #ifndef __NINTENDODS__ /* TODO: figure out why the following happens: 177 #if !defined(__NINTENDODS__) && !defined(__ANDROID__)
178 include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative 178 /* TODO: figure out why the following happens:
179 include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */ 179 include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative
180 include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */
180 SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); 181 SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
181 SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); 182 SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
182 #endif 183 #endif
183 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ 184 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */
184 /** \endcond */ 185 /** \endcond */
193 #pragma enumsalwaysint on 194 #pragma enumsalwaysint on
194 #endif 195 #endif
195 196
196 /** \cond */ 197 /** \cond */
197 #ifndef DOXYGEN_SHOULD_IGNORE_THIS 198 #ifndef DOXYGEN_SHOULD_IGNORE_THIS
198 #ifndef __NINTENDODS__ /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ 199 #if !defined(__NINTENDODS__) && !defined(__ANDROID__)
200 /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
199 typedef enum 201 typedef enum
200 { 202 {
201 DUMMY_ENUM_VALUE 203 DUMMY_ENUM_VALUE
202 } SDL_DUMMY_ENUM; 204 } SDL_DUMMY_ENUM;
203 205