Fix -Wundef warnings due to use of unguarded SDL_VIDEO_DRIVER_ANDROID

2026-06-12 01:15:39 +00:00 · 2023-03-27 14:46:08 +02:00 · 2023-03-27 14:46:08 +02:00 · 915d3159cf
commit 915d3159cf
parent 7f68915681
20 changed files with 28 additions and 28 deletions
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@ -245,7 +245,7 @@ static int GLES2_LoadFunctions(GLES2_RenderData *data)
 {
 #if SDL_VIDEO_DRIVER_UIKIT
 #define __SDL_NOGETPROCADDR__
-#elif SDL_VIDEO_DRIVER_ANDROID
+#elif defined(SDL_VIDEO_DRIVER_ANDROID)
 #define __SDL_NOGETPROCADDR__
 #endif

--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@ -25,7 +25,7 @@
 #if defined(SDL_VIDEO_DRIVER_WINDOWS) || SDL_VIDEO_DRIVER_WINRT
 #include "../core/windows/SDL_windows.h"
 #endif
-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
 #include <android/native_window.h>
 #include "../video/android/SDL_androidvideo.h"
 #endif
@ -67,7 +67,7 @@
 #define DEFAULT_OGL_ES_PVR (vc4 ? "libGLES_CM.so.1" : "libbrcmGLESv2.so")
 #define DEFAULT_OGL_ES     (vc4 ? "libGLESv1_CM.so.1" : "libbrcmGLESv2.so")

-#elif SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_VIVANTE
+#elif defined(SDL_VIDEO_DRIVER_ANDROID) || SDL_VIDEO_DRIVER_VIVANTE
 /* Android */
 #define DEFAULT_EGL        "libEGL.so"
 #define DEFAULT_OGL_ES2    "libGLESv2.so"
@ -971,7 +971,7 @@ SDL_EGL_CreateContext(_THIS, EGLSurface egl_surface)
        share_context = (EGLContext)SDL_GL_GetCurrentContext();
    }

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
    if (_this->gl_config.flags & SDL_GL_CONTEXT_DEBUG_FLAG) {
        /* If SDL_GL_CONTEXT_DEBUG_FLAG is set but EGL_KHR_debug unsupported, unset.
         * This is required because some Android devices like to complain about it
@ -1220,7 +1220,7 @@ int SDL_EGL_DeleteContext(_THIS, SDL_GLContext context)
 EGLSurface *
 SDL_EGL_CreateSurface(_THIS, SDL_Window *window, NativeWindowType nw)
 {
-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
    EGLint format_wanted;
    EGLint format_got;
 #endif
@ -1234,7 +1234,7 @@ SDL_EGL_CreateSurface(_THIS, SDL_Window *window, NativeWindowType nw)
        return EGL_NO_SURFACE;
    }

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
    /* On Android, EGL_NATIVE_VISUAL_ID is an attribute of the EGLConfig that is
     * guaranteed to be accepted by ANativeWindow_setBuffersGeometry(). */
    _this->egl_data->eglGetConfigAttrib(_this->egl_data->egl_display,
@ -1302,7 +1302,7 @@ SDL_EGL_CreateSurface(_THIS, SDL_Window *window, NativeWindowType nw)
        SDL_EGL_SetError("unable to create an EGL window surface", "eglCreateWindowSurface");
    }

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
    format_got = ANativeWindow_getFormat(nw);
    Android_SetFormat(format_wanted, format_got);
 #endif
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@ -88,7 +88,7 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_UIKIT
    &UIKIT_bootstrap,
 #endif
-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
    &Android_bootstrap,
 #endif
 #if SDL_VIDEO_DRIVER_PS2
@ -4650,7 +4650,7 @@ int SDL_GetMessageBoxCount(void)
    return SDL_AtomicGet(&SDL_messagebox_count);
 }

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
 #include "android/SDL_androidmessagebox.h"
 #endif
 #ifdef SDL_VIDEO_DRIVER_WINDOWS
@ -4740,7 +4740,7 @@ int SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
    }

    /* It's completely fine to call this function before video is initialized */
-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
    if (retval == -1 &&
        Android_ShowMessageBox(messageboxdata, buttonid) == 0) {
        retval = 0;
--- a/src/video/SDL_vulkan_internal.h
+++ b/src/video/SDL_vulkan_internal.h
@ -28,7 +28,7 @@
 #error You should not be here.
 #endif

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID
 #define VK_USE_PLATFORM_ANDROID_KHR
 #endif
 #if SDL_VIDEO_DRIVER_COCOA
--- a/src/video/android/SDL_androidclipboard.c
+++ b/src/video/android/SDL_androidclipboard.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include "SDL_androidvideo.h"
 #include "SDL_androidclipboard.h"
--- a/src/video/android/SDL_androidevents.c
+++ b/src/video/android/SDL_androidevents.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include "SDL_androidevents.h"
 #include "SDL_androidkeyboard.h"
--- a/src/video/android/SDL_androidgl.c
+++ b/src/video/android/SDL_androidgl.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID && SDL_VIDEO_OPENGL_EGL
+#if defined(SDL_VIDEO_DRIVER_ANDROID) && SDL_VIDEO_OPENGL_EGL

 /* Android SDL video driver implementation */

--- a/src/video/android/SDL_androidkeyboard.c
+++ b/src/video/android/SDL_androidkeyboard.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include <android/log.h>

--- a/src/video/android/SDL_androidmessagebox.c
+++ b/src/video/android/SDL_androidmessagebox.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include "SDL_androidmessagebox.h"
 #include "../../core/android/SDL_android.h"
--- a/src/video/android/SDL_androidmessagebox.h
+++ b/src/video/android/SDL_androidmessagebox.h
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 extern int Android_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);

--- a/src/video/android/SDL_androidmouse.c
+++ b/src/video/android/SDL_androidmouse.c
@ -21,7 +21,7 @@

 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include "SDL_androidmouse.h"

--- a/src/video/android/SDL_androidtouch.c
+++ b/src/video/android/SDL_androidtouch.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include <android/log.h>

--- a/src/video/android/SDL_androidvideo.c
+++ b/src/video/android/SDL_androidvideo.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 /* Android SDL video driver implementation */

--- a/src/video/android/SDL_androidvulkan.c
+++ b/src/video/android/SDL_androidvulkan.c
@ -26,7 +26,7 @@

 #include "SDL_internal.h"

-#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_ANDROID
+#if SDL_VIDEO_VULKAN && defined(SDL_VIDEO_DRIVER_ANDROID)

 #include "SDL_androidvideo.h"
 #include "SDL_androidwindow.h"
--- a/src/video/android/SDL_androidvulkan.h
+++ b/src/video/android/SDL_androidvulkan.h
@ -32,7 +32,7 @@
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"

-#if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_ANDROID
+#if SDL_VIDEO_VULKAN && defined(SDL_VIDEO_DRIVER_ANDROID)

 int Android_Vulkan_LoadLibrary(_THIS, const char *path);
 void Android_Vulkan_UnloadLibrary(_THIS);
--- a/src/video/android/SDL_androidwindow.c
+++ b/src/video/android/SDL_androidwindow.c
@ -20,7 +20,7 @@
 */
 #include "SDL_internal.h"

-#if SDL_VIDEO_DRIVER_ANDROID
+#ifdef SDL_VIDEO_DRIVER_ANDROID

 #include "../SDL_sysvideo.h"
 #include "../../events/SDL_keyboard_c.h"
--- a/test/testautomation_keyboard.c
+++ b/test/testautomation_keyboard.c
@ -461,7 +461,7 @@ static int keyboard_setTextInputRect(void *arg)
 static int keyboard_setTextInputRectNegative(void *arg)
 {
    /* Some platforms set also an error message; prepare for checking it */
-#if defined(SDL_VIDEO_DRIVER_WINDOWS) || SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_COCOA
+#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_ANDROID) || SDL_VIDEO_DRIVER_COCOA
    const char *expectedError = "Parameter 'rect' is invalid";
    const char *error;

@ -474,7 +474,7 @@ static int keyboard_setTextInputRectNegative(void *arg)
    SDLTest_AssertPass("Call to SDL_SetTextInputRect(NULL)");

    /* Some platforms set also an error message; so check it */
-#if defined(SDL_VIDEO_DRIVER_WINDOWS) || SDL_VIDEO_DRIVER_ANDROID || SDL_VIDEO_DRIVER_COCOA
+#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_ANDROID) || SDL_VIDEO_DRIVER_COCOA
    error = SDL_GetError();
    SDLTest_AssertPass("Call to SDL_GetError()");
    SDLTest_AssertCheck(error != NULL, "Validate that error message was not NULL");
--- a/test/testgl.c
+++ b/test/testgl.c
@ -36,7 +36,7 @@ static int LoadContext(GL_Context *data)
 {
 #if SDL_VIDEO_DRIVER_UIKIT
 #define __SDL_NOGETPROCADDR__
-#elif SDL_VIDEO_DRIVER_ANDROID
+#elif defined(SDL_VIDEO_DRIVER_ANDROID)
 #define __SDL_NOGETPROCADDR__
 #endif

--- a/test/testgles2.c
+++ b/test/testgles2.c
@ -62,7 +62,7 @@ static int LoadContext(GLES2_Context *data)
 {
 #if SDL_VIDEO_DRIVER_UIKIT
 #define __SDL_NOGETPROCADDR__
-#elif SDL_VIDEO_DRIVER_ANDROID
+#elif defined(SDL_VIDEO_DRIVER_ANDROID)
 #define __SDL_NOGETPROCADDR__
 #endif

--- a/test/testgles2_sdf.c
+++ b/test/testgles2_sdf.c
@ -64,7 +64,7 @@ static int LoadContext(GLES2_Context *data)
 {
 #if SDL_VIDEO_DRIVER_UIKIT
 #define __SDL_NOGETPROCADDR__
-#elif SDL_VIDEO_DRIVER_ANDROID
+#elif defined(SDL_VIDEO_DRIVER_ANDROID)
 #define __SDL_NOGETPROCADDR__
 #endif