# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1139541542 0
# Node ID 67114343400d62aafc24f25dbc9d779281966dac
# Parent  4d0f2b2147cf1b61e4c378d037c51f7740fde9be
*** empty log message ***

diff -r 4d0f2b2147cf -r 67114343400d include/SDL.h
--- a/include/SDL.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_active.h
--- a/include/SDL_active.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_active.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 @@
 }
 #endif
 #include "close_code.h"
-#endif /* !DISABLE_EVENTS */
 
 #endif /* _SDL_active_h */
diff -r 4d0f2b2147cf -r 67114343400d include/SDL_audio.h
--- a/include/SDL_audio.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_audio.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 @@
 }
 #endif
 #include "close_code.h"
-#endif /* !DISABLE_AUDIO */
 
 #endif /* _SDL_audio_h */
diff -r 4d0f2b2147cf -r 67114343400d include/SDL_cdrom.h
--- a/include/SDL_cdrom.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_cdrom.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 @@
 }
 #endif
 #include "close_code.h"
-#endif /* !DISABLE_CDROM */
 
 #endif /* _SDL_video_h */
diff -r 4d0f2b2147cf -r 67114343400d include/SDL_cpuinfo.h
--- a/include/SDL_cpuinfo.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_cpuinfo.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 @@
 }
 #endif
 #include "close_code.h"
-#endif /* !DISABLE_CPUINFO */
 
 #endif /* _SDL_cpuinfo_h */
diff -r 4d0f2b2147cf -r 67114343400d include/SDL_error.h
--- a/include/SDL_error.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_error.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_events.h
--- a/include/SDL_events.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_events.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_joystick.h
--- a/include/SDL_joystick.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_joystick.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_keyboard.h
--- a/include/SDL_keyboard.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_keyboard.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_loadso.h
--- a/include/SDL_loadso.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_loadso.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_main.h
--- a/include/SDL_main.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_main.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 @@
 
 /* From the SDL library code -- needed for registering the app on Win32 */
 #if defined(WIN32)
-#include "SDL_types.h"
+
 #include "begin_code.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -74,8 +75,8 @@
 
 /* From the SDL library code -- needed for registering QuickDraw on MacOS */
 #if defined(macintosh)
+
 #include "begin_code.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -r 4d0f2b2147cf -r 67114343400d include/SDL_mouse.h
--- a/include/SDL_mouse.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_mouse.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_mutex.h
--- a/include/SDL_mutex.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_mutex.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_quit.h
--- a/include/SDL_quit.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_quit.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_rwops.h
--- a/include/SDL_rwops.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_rwops.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 @@
 }
 #endif
 #include "close_code.h"
-#endif /* !DISABLE_FILE */
 
 #endif /* _SDL_RWops_h */
diff -r 4d0f2b2147cf -r 67114343400d include/SDL_syswm.h
--- a/include/SDL_syswm.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_syswm.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_thread.h
--- a/include/SDL_thread.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_thread.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_timer.h
--- a/include/SDL_timer.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_timer.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_version.h
--- a/include/SDL_version.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_version.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_video.h
--- a/include/SDL_video.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_video.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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 -r 4d0f2b2147cf -r 67114343400d include/SDL_windows.h
--- a/include/SDL_windows.h	Fri Feb 10 03:00:38 2006 +0000
+++ b/include/SDL_windows.h	Fri Feb 10 03:19:02 2006 +0000
@@ -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