Updated config headers to override the base SDL_config.h if both are included

include/SDL_config_android.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_android_h_
 #define SDL_config_android_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_iphoneos.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_iphoneos_h_
 #define SDL_config_iphoneos_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_macosx.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_macosx_h_
 #define SDL_config_macosx_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_minimal.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_minimal_h_
 #define SDL_config_minimal_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_pandora.h

@@ -19,7 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SDL_config_h_
+#ifndef SDL_config_pandora_h_
+#define SDL_config_pandora_h_
 #define SDL_config_h_
 
 /* This is a set of defines to configure the SDL features */
@@ -124,4 +125,4 @@
 #define SDL_VIDEO_RENDER_OGL_ES 1
 #define SDL_VIDEO_OPENGL_ES 1
 
-#endif /* SDL_config_h_ */
+#endif /* SDL_config_pandora_h_ */

include/SDL_config_psp.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_psp_h_
 #define SDL_config_psp_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_windows.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_windows_h_
 #define SDL_config_windows_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_winrt.h

@@ -21,6 +21,7 @@
 
 #ifndef SDL_config_winrt_h_
 #define SDL_config_winrt_h_
+#define SDL_config_h_
 
 #include "SDL_platform.h"
 

include/SDL_config_wiz.h

@@ -19,7 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef SDL_config_h_
+#ifndef SDL_config_wiz_h_
+#define SDL_config_wiz_h_
 #define SDL_config_h_
 
 /* This is a set of defines to configure the SDL features */
@@ -117,4 +118,4 @@
 #define SDL_VIDEO_RENDER_OGL_ES 1
 #define SDL_VIDEO_OPENGL_ES 1
 
-#endif /* SDL_config_h_ */
+#endif /* SDL_config_wiz_h_ */