Mercurial > sdl-ios-xcode

comparison src/SDL.c @ 5062:e8916fe9cfc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed bug #925 Changed "win32" to "windows"
author Sam Lantinga <slouken@libsdl.org>
date Thu, 20 Jan 2011 18:04:05 -0800
parents 791b3256fb22
children c2539ff054c8
comparison
equal deleted inserted replaced
5061:9e9940eae455 5062:e8916fe9cfc8
37 #if !SDL_TIMERS_DISABLED 37 #if !SDL_TIMERS_DISABLED
38 extern void SDL_StartTicks(void); 38 extern void SDL_StartTicks(void);
39 extern int SDL_TimerInit(void); 39 extern int SDL_TimerInit(void);
40 extern void SDL_TimerQuit(void); 40 extern void SDL_TimerQuit(void);
41 #endif 41 #endif
42 #if defined(__WIN32__) 42 #if defined(__WINDOWS__)
43 extern int SDL_HelperWindowCreate(void); 43 extern int SDL_HelperWindowCreate(void);
44 extern int SDL_HelperWindowDestroy(void); 44 extern int SDL_HelperWindowDestroy(void);
45 #endif 45 #endif
46 46
47 47
145 } 145 }
146 146
147 /* Clear the error message */ 147 /* Clear the error message */
148 SDL_ClearError(); 148 SDL_ClearError();
149 149
150 #if defined(__WIN32__) 150 #if defined(__WINDOWS__)
151 if (SDL_HelperWindowCreate() < 0) { 151 if (SDL_HelperWindowCreate() < 0) {
152 return -1; 152 return -1;
153 } 153 }
154 #endif 154 #endif
155 155
218 #ifdef DEBUG_BUILD 218 #ifdef DEBUG_BUILD
219 printf("[SDL_Quit] : Enter! Calling QuitSubSystem()\n"); 219 printf("[SDL_Quit] : Enter! Calling QuitSubSystem()\n");
220 fflush(stdout); 220 fflush(stdout);
221 #endif 221 #endif
222 222
223 #if defined(__WIN32__) 223 #if defined(__WINDOWS__)
224 SDL_HelperWindowDestroy(); 224 SDL_HelperWindowDestroy();
225 #endif 225 #endif
226 SDL_QuitSubSystem(SDL_INIT_EVERYTHING); 226 SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
227 227
228 #ifdef CHECK_LEAKS 228 #ifdef CHECK_LEAKS
310 return "QNX Neutrino"; 310 return "QNX Neutrino";
311 #elif __RISCOS__ 311 #elif __RISCOS__
312 return "RISC OS"; 312 return "RISC OS";
313 #elif __SOLARIS__ 313 #elif __SOLARIS__
314 return "Solaris"; 314 return "Solaris";
315 #elif __WIN32__ 315 #elif __WINDOWS__
316 #ifdef _WIN32_WCE 316 #ifdef _WIN32_WCE
317 return "Windows CE"; 317 return "Windows CE";
318 #else 318 #else
319 return "Windows"; 319 return "Windows";
320 #endif 320 #endif
323 #else 323 #else
324 return "Unknown (see SDL_platform.h)"; 324 return "Unknown (see SDL_platform.h)";
325 #endif 325 #endif
326 } 326 }
327 327
328 #if defined(__WIN32__) 328 #if defined(__WINDOWS__)
329 329
330 #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL)) 330 #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
331 /* Need to include DllMain() on Watcom C for some reason.. */ 331 /* Need to include DllMain() on Watcom C for some reason.. */
332 #define WIN32_LEAN_AND_MEAN 332 #define WIN32_LEAN_AND_MEAN
333 #include <windows.h> 333 #include <windows.h>
345 } 345 }
346 return TRUE; 346 return TRUE;
347 } 347 }
348 #endif /* building DLL with Watcom C */ 348 #endif /* building DLL with Watcom C */
349 349
350 #endif /* __WIN32__ */ 350 #endif /* __WINDOWS__ */
351 351
352 /* vi: set ts=4 sw=4 expandtab: */ 352 /* vi: set ts=4 sw=4 expandtab: */