From 3d4edde1fe27f351750e0e39e026ebe8155460b1 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 10 Feb 2006 03:19:02 +0000 Subject: [PATCH] *** empty log message *** --- include/SDL.h | 1 - include/SDL_active.h | 2 -- include/SDL_audio.h | 5 +---- include/SDL_cdrom.h | 2 -- include/SDL_cpuinfo.h | 2 -- include/SDL_error.h | 2 ++ include/SDL_events.h | 2 +- include/SDL_joystick.h | 2 +- include/SDL_keyboard.h | 2 +- include/SDL_loadso.h | 2 ++ include/SDL_main.h | 7 ++++--- include/SDL_mouse.h | 2 +- include/SDL_mutex.h | 3 +-- include/SDL_quit.h | 2 ++ include/SDL_rwops.h | 2 -- include/SDL_syswm.h | 1 + include/SDL_thread.h | 3 +-- include/SDL_timer.h | 3 +-- include/SDL_version.h | 2 +- include/SDL_video.h | 2 +- include/SDL_windows.h | 3 +-- 21 files changed, 22 insertions(+), 30 deletions(-) diff --git a/include/SDL.h b/include/SDL.h index a868f6c28..27aba2b30 100644 --- a/include/SDL.h +++ b/include/SDL.h @@ -26,7 +26,6 @@ #define _SDL_H #include "SDL_stdinc.h" -#include "SDL_main.h" #include "SDL_error.h" #include "SDL_rwops.h" #include "SDL_timer.h" diff --git a/include/SDL_active.h b/include/SDL_active.h index 4c7b1bbb5..bf822338a 100644 --- a/include/SDL_active.h +++ b/include/SDL_active.h @@ -27,7 +27,6 @@ #include "SDL_stdinc.h" -#ifndef DISABLE_EVENTS #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -54,6 +53,5 @@ extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void); } #endif #include "close_code.h" -#endif /* !DISABLE_EVENTS */ #endif /* _SDL_active_h */ diff --git a/include/SDL_audio.h b/include/SDL_audio.h index 4fd775adc..a10c0e021 100644 --- a/include/SDL_audio.h +++ b/include/SDL_audio.h @@ -26,12 +26,10 @@ #define _SDL_audio_h #include "SDL_stdinc.h" -#include "SDL_main.h" #include "SDL_error.h" #include "SDL_rwops.h" -#include "SDL_byteorder.h" +#include "SDL_endian.h" -#ifndef DISABLE_AUDIO #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -249,6 +247,5 @@ extern DECLSPEC void SDLCALL SDL_CloseAudio(void); } #endif #include "close_code.h" -#endif /* !DISABLE_AUDIO */ #endif /* _SDL_audio_h */ diff --git a/include/SDL_cdrom.h b/include/SDL_cdrom.h index fae03b634..59944bf8b 100644 --- a/include/SDL_cdrom.h +++ b/include/SDL_cdrom.h @@ -27,7 +27,6 @@ #include "SDL_stdinc.h" -#ifndef DISABLE_CDROM #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -167,6 +166,5 @@ extern DECLSPEC void SDLCALL SDL_CDClose(SDL_CD *cdrom); } #endif #include "close_code.h" -#endif /* !DISABLE_CDROM */ #endif /* _SDL_video_h */ diff --git a/include/SDL_cpuinfo.h b/include/SDL_cpuinfo.h index 5812aa714..47e64c03e 100644 --- a/include/SDL_cpuinfo.h +++ b/include/SDL_cpuinfo.h @@ -28,7 +28,6 @@ #ifndef _SDL_cpuinfo_h #define _SDL_cpuinfo_h -#ifndef DISABLE_CPUINFO #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -72,6 +71,5 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(); } #endif #include "close_code.h" -#endif /* !DISABLE_CPUINFO */ #endif /* _SDL_cpuinfo_h */ diff --git a/include/SDL_error.h b/include/SDL_error.h index 363ab359c..3871953f5 100644 --- a/include/SDL_error.h +++ b/include/SDL_error.h @@ -25,6 +25,8 @@ #ifndef _SDL_error_h #define _SDL_error_h +#include "SDL_stdinc.h" + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus diff --git a/include/SDL_events.h b/include/SDL_events.h index 2fa50720f..4321d0457 100644 --- a/include/SDL_events.h +++ b/include/SDL_events.h @@ -25,7 +25,7 @@ #ifndef _SDL_events_h #define _SDL_events_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "SDL_active.h" #include "SDL_keyboard.h" #include "SDL_mouse.h" diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h index f6f23b529..e0f904ab8 100644 --- a/include/SDL_joystick.h +++ b/include/SDL_joystick.h @@ -25,7 +25,7 @@ #ifndef _SDL_joystick_h #define _SDL_joystick_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_keyboard.h b/include/SDL_keyboard.h index c0face706..f99deacf5 100644 --- a/include/SDL_keyboard.h +++ b/include/SDL_keyboard.h @@ -25,7 +25,7 @@ #ifndef _SDL_keyboard_h #define _SDL_keyboard_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "SDL_keysym.h" #include "begin_code.h" diff --git a/include/SDL_loadso.h b/include/SDL_loadso.h index 6bc02330d..35d0db5ff 100644 --- a/include/SDL_loadso.h +++ b/include/SDL_loadso.h @@ -41,6 +41,8 @@ #ifndef _SDL_loadso_h #define _SDL_loadso_h +#include "SDL_stdinc.h" + #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus diff --git a/include/SDL_main.h b/include/SDL_main.h index ee00e2a95..b6a16ef7b 100644 --- a/include/SDL_main.h +++ b/include/SDL_main.h @@ -23,6 +23,8 @@ #ifndef _SDL_main_h #define _SDL_main_h +#include "SDL_stdinc.h" + /* Redefine main() on Win32 and MacOS so that it is called by winmain.c */ #if defined(WIN32) || defined(_WIN32) || \ @@ -53,9 +55,8 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]); /* From the SDL library code -- needed for registering the app on Win32 */ #if defined(WIN32) -#include "SDL_types.h" -#include "begin_code.h" +#include "begin_code.h" #ifdef __cplusplus extern "C" { #endif @@ -74,8 +75,8 @@ extern DECLSPEC void SDLCALL SDL_UnregisterApp(); /* From the SDL library code -- needed for registering QuickDraw on MacOS */ #if defined(macintosh) -#include "begin_code.h" +#include "begin_code.h" #ifdef __cplusplus extern "C" { #endif diff --git a/include/SDL_mouse.h b/include/SDL_mouse.h index cb1336556..33c445db5 100644 --- a/include/SDL_mouse.h +++ b/include/SDL_mouse.h @@ -25,7 +25,7 @@ #ifndef _SDL_mouse_h #define _SDL_mouse_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "SDL_video.h" #include "begin_code.h" diff --git a/include/SDL_mutex.h b/include/SDL_mutex.h index 7b0e3b367..cecb205c3 100644 --- a/include/SDL_mutex.h +++ b/include/SDL_mutex.h @@ -28,8 +28,7 @@ These are independent of the other SDL routines. */ -#include "SDL_main.h" -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_quit.h b/include/SDL_quit.h index e85026a58..b0a8003f5 100644 --- a/include/SDL_quit.h +++ b/include/SDL_quit.h @@ -25,6 +25,8 @@ #ifndef _SDL_quit_h #define _SDL_quit_h +#include "SDL_stdinc.h" + /* An SDL_QUITEVENT is generated when the user tries to close the application window. If it is ignored or filtered out, the window will remain open. diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h index 725031c6d..05a088edd 100644 --- a/include/SDL_rwops.h +++ b/include/SDL_rwops.h @@ -29,7 +29,6 @@ #include "SDL_stdinc.h" -#ifndef DISABLE_FILE #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ #ifdef __cplusplus @@ -129,6 +128,5 @@ extern DECLSPEC int SDLCALL SDL_WriteBE64(SDL_RWops *dst, Uint64 value); } #endif #include "close_code.h" -#endif /* !DISABLE_FILE */ #endif /* _SDL_RWops_h */ diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index 19c6ef633..6992669f6 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -25,6 +25,7 @@ #ifndef _SDL_syswm_h #define _SDL_syswm_h +#include "SDL_stdinc.h" #include "SDL_version.h" #include "begin_code.h" diff --git a/include/SDL_thread.h b/include/SDL_thread.h index edb950129..3c0826f59 100644 --- a/include/SDL_thread.h +++ b/include/SDL_thread.h @@ -28,8 +28,7 @@ These are independent of the other SDL routines. */ -#include "SDL_main.h" -#include "SDL_types.h" +#include "SDL_stdinc.h" /* Thread synchronization primitives */ #include "SDL_mutex.h" diff --git a/include/SDL_timer.h b/include/SDL_timer.h index b834bde4f..22c49c3a1 100644 --- a/include/SDL_timer.h +++ b/include/SDL_timer.h @@ -25,8 +25,7 @@ /* Header for the SDL time management routines */ -#include "SDL_main.h" -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_version.h b/include/SDL_version.h index 6514581b7..52dd52f40 100644 --- a/include/SDL_version.h +++ b/include/SDL_version.h @@ -25,7 +25,7 @@ #ifndef _SDL_version_h #define _SDL_version_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "begin_code.h" /* Set up for C function definitions, even when using C++ */ diff --git a/include/SDL_video.h b/include/SDL_video.h index e5e7e7897..24e7e759b 100644 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -25,7 +25,7 @@ #ifndef _SDL_video_h #define _SDL_video_h -#include "SDL_types.h" +#include "SDL_stdinc.h" #include "SDL_mutex.h" #include "SDL_rwops.h" diff --git a/include/SDL_windows.h b/include/SDL_windows.h index dff14d0c5..45cedd42f 100644 --- a/include/SDL_windows.h +++ b/include/SDL_windows.h @@ -23,8 +23,7 @@ #ifndef _SDL_windows_h #define _SDL_windows_h -#include "SDL_config.h" -#include "SDL_types.h" +#include "SDL_stdinc.h" /* This includes only the windows headers needed by SDL, with no C runtime */ #define WIN32_LEAN_AND_MEAN