Removed a bunch of unnecessary #ifdefs.

src/power/SDL_syspower.h

@@ -27,41 +27,19 @@
 
 #include "SDL_power.h"
 
-#ifndef SDL_POWER_DISABLED
-#ifdef SDL_POWER_LINUX          /* in order of preference. More than could work. */
+/* Not all of these are available in a given build. Use #ifdefs, etc. */
 SDL_bool SDL_GetPowerInfo_Linux_sys_class_power_supply(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_Linux_proc_acpi(SDL_PowerState *, int *, int *);
 SDL_bool SDL_GetPowerInfo_Linux_proc_apm(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_WINDOWS        /* handles Win32, Win64, PocketPC. */
 SDL_bool SDL_GetPowerInfo_Windows(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_UIKIT          /* handles iPhone/iPad/etc */
 SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_MACOSX         /* handles Mac OS X, Darwin. */
 SDL_bool SDL_GetPowerInfo_MacOSX(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_HAIKU          /* with BeOS euc.jp apm driver. Does this work on Haiku? */
 SDL_bool SDL_GetPowerInfo_Haiku(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_ANDROID        /* handles Android. */
 SDL_bool SDL_GetPowerInfo_Android(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_PSP        /* handles PSP. */
 SDL_bool SDL_GetPowerInfo_PSP(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_WINRT          /* handles WinRT */
 SDL_bool SDL_GetPowerInfo_WinRT(SDL_PowerState *, int *, int *);
-#endif
-#ifdef SDL_POWER_EMSCRIPTEN     /* handles Emscripten */
 SDL_bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *, int *, int *);
-#endif
-
-#ifdef SDL_POWER_HARDWIRED
 SDL_bool SDL_GetPowerInfo_Hardwired(SDL_PowerState *, int *, int *);
-#endif
-#endif
 
 #endif /* SDL_syspower_h_ */
 

src/power/haiku/SDL_syspower.c

@@ -20,7 +20,9 @@
 */
 #include "../../SDL_internal.h"
 
+/* uses BeOS euc.jp apm driver. */
 /* !!! FIXME: does this thing even work on Haiku? */
+
 #ifndef SDL_POWER_DISABLED
 #if SDL_POWER_HAIKU
 

src/render/SDL_sysrender.h

@@ -173,33 +173,16 @@ struct SDL_RenderDriver
     SDL_RendererInfo info;
 };
 
-#if !SDL_RENDER_DISABLED
-
-#if SDL_VIDEO_RENDER_D3D
+/* Not all of these are available in a given build. Use #ifdefs, etc. */
 extern SDL_RenderDriver D3D_RenderDriver;
-#endif
-#if SDL_VIDEO_RENDER_D3D11
 extern SDL_RenderDriver D3D11_RenderDriver;
-#endif
-#if SDL_VIDEO_RENDER_OGL
 extern SDL_RenderDriver GL_RenderDriver;
-#endif
-#if SDL_VIDEO_RENDER_OGL_ES2
 extern SDL_RenderDriver GLES2_RenderDriver;
-#endif
-#if SDL_VIDEO_RENDER_OGL_ES
 extern SDL_RenderDriver GLES_RenderDriver;
-#endif
-#if SDL_VIDEO_RENDER_DIRECTFB
 extern SDL_RenderDriver DirectFB_RenderDriver;
-#endif
-#if SDL_VIDEO_RENDER_PSP
 extern SDL_RenderDriver PSP_RenderDriver;
-#endif
 extern SDL_RenderDriver SW_RenderDriver;
 
-#endif /* !SDL_RENDER_DISABLED */
-
 #endif /* SDL_sysrender_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/video/SDL_sysvideo.h

@@ -372,57 +372,24 @@ typedef struct VideoBootStrap
     SDL_VideoDevice *(*create) (int devindex);
 } VideoBootStrap;
 
-#if SDL_VIDEO_DRIVER_COCOA
+/* Not all of these are available in a given build. Use #ifdefs, etc. */
 extern VideoBootStrap COCOA_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_X11
 extern VideoBootStrap X11_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_MIR
 extern VideoBootStrap MIR_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_DIRECTFB
 extern VideoBootStrap DirectFB_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_WINDOWS
 extern VideoBootStrap WINDOWS_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_WINRT
 extern VideoBootStrap WINRT_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_HAIKU
 extern VideoBootStrap HAIKU_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_PANDORA
 extern VideoBootStrap PND_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_UIKIT
 extern VideoBootStrap UIKIT_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_ANDROID
 extern VideoBootStrap Android_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_PSP
 extern VideoBootStrap PSP_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_RPI
 extern VideoBootStrap RPI_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_DUMMY
 extern VideoBootStrap DUMMY_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_WAYLAND
 extern VideoBootStrap Wayland_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_NACL
 extern VideoBootStrap NACL_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_VIVANTE
 extern VideoBootStrap VIVANTE_bootstrap;
-#endif
-#if SDL_VIDEO_DRIVER_EMSCRIPTEN
 extern VideoBootStrap Emscripten_bootstrap;
-#endif
 
 extern SDL_VideoDevice *SDL_GetVideoDevice(void);
 extern int SDL_AddBasicVideoDisplay(const SDL_DisplayMode * desktop_mode);