From 94754c39686ab128e1ddac7baebf267c3289dc22 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Mon, 20 Feb 2017 10:55:33 -0800 Subject: [PATCH] Updated config headers to override the base SDL_config.h if both are included --- include/SDL_config_android.h | 1 + include/SDL_config_iphoneos.h | 1 + include/SDL_config_macosx.h | 1 + include/SDL_config_minimal.h | 1 + include/SDL_config_pandora.h | 5 +++-- include/SDL_config_psp.h | 1 + include/SDL_config_windows.h | 1 + include/SDL_config_winrt.h | 1 + include/SDL_config_wiz.h | 5 +++-- 9 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/SDL_config_android.h b/include/SDL_config_android.h index a7090d1d50b8b..32fa96cb8e24c 100644 --- a/include/SDL_config_android.h +++ b/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" diff --git a/include/SDL_config_iphoneos.h b/include/SDL_config_iphoneos.h index ccc1c364a51f3..7d5af2c66cacb 100644 --- a/include/SDL_config_iphoneos.h +++ b/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" diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h index e439d987f2134..4b29f62c01134 100644 --- a/include/SDL_config_macosx.h +++ b/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" diff --git a/include/SDL_config_minimal.h b/include/SDL_config_minimal.h index 7b3e68bfd28ca..31127006c50c2 100644 --- a/include/SDL_config_minimal.h +++ b/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" diff --git a/include/SDL_config_pandora.h b/include/SDL_config_pandora.h index 02be3c67e87dc..ea62fe59ac6f0 100644 --- a/include/SDL_config_pandora.h +++ b/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_ */ diff --git a/include/SDL_config_psp.h b/include/SDL_config_psp.h index d0109c9319e8c..28efb4c5c0c76 100644 --- a/include/SDL_config_psp.h +++ b/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" diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h index 2c25791311248..007e11cbabb90 100644 --- a/include/SDL_config_windows.h +++ b/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" diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h index a9a8345078482..24f9e17f2011e 100644 --- a/include/SDL_config_winrt.h +++ b/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" diff --git a/include/SDL_config_wiz.h b/include/SDL_config_wiz.h index 9e1de38e03ba4..5bb845a0ccaf6 100644 --- a/include/SDL_config_wiz.h +++ b/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_ */