Fix -Wundef warnings due to use of unguarded SDL_VIDEO_DRIVER_RPI

This commit is contained in:
Anonymous Maarten
2023-03-27 15:49:22 +02:00
parent d986747f70
commit 2d412f25e1
7 changed files with 10 additions and 10 deletions

View File

@@ -29,7 +29,7 @@
#include <android/native_window.h>
#include "../video/android/SDL_androidvideo.h"
#endif
#if SDL_VIDEO_DRIVER_RPI
#ifdef SDL_VIDEO_DRIVER_RPI
#include <unistd.h>
#endif
#if SDL_VIDEO_VITA_PVR_OGL
@@ -58,7 +58,7 @@
#define EGL_PRESENT_OPAQUE_EXT 0x31DF
#endif /* EGL_EXT_present_opaque */
#if SDL_VIDEO_DRIVER_RPI
#if defined(SDL_VIDEO_DRIVER_RPI)
/* Raspbian places the OpenGL ES/EGL binaries in a non standard path */
#define DEFAULT_EGL (vc4 ? "libEGL.so.1" : "libbrcmEGL.so")
#define DEFAULT_OGL_ES2 (vc4 ? "libGLESv2.so.2" : "libbrcmGLESv2.so")
@@ -304,7 +304,7 @@ static int SDL_EGL_LoadLibraryInternal(_THIS, const char *egl_path)
#if defined(SDL_VIDEO_DRIVER_WINDOWS) || defined(SDL_VIDEO_DRIVER_WINRT)
const char *d3dcompiler;
#endif
#if SDL_VIDEO_DRIVER_RPI
#if defined(SDL_VIDEO_DRIVER_RPI)
SDL_bool vc4 = (0 == access("/sys/module/vc4/", F_OK));
#endif
@@ -425,7 +425,7 @@ static int SDL_EGL_LoadLibraryInternal(_THIS, const char *egl_path)
#endif
_this->egl_data->egl_dll_handle = egl_dll_handle;
#if SDL_VIDEO_DRIVER_VITA
#if defined(SDL_VIDEO_DRIVER_VITA)
_this->egl_data->opengl_dll_handle = opengl_dll_handle;
#endif

View File

@@ -109,7 +109,7 @@ static VideoBootStrap *bootstrap[] = {
#if SDL_VIDEO_DRIVER_RISCOS
&RISCOS_bootstrap,
#endif
#if SDL_VIDEO_DRIVER_RPI
#ifdef SDL_VIDEO_DRIVER_RPI
&RPI_bootstrap,
#endif
#if SDL_VIDEO_DRIVER_EMSCRIPTEN

View File

@@ -21,7 +21,7 @@
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_RPI
#ifdef SDL_VIDEO_DRIVER_RPI
#include "../../events/SDL_events_c.h"
#include "../../events/SDL_keyboard_c.h"

View File

@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_RPI
#ifdef SDL_VIDEO_DRIVER_RPI
#include "SDL_rpivideo.h"
#include "SDL_rpimouse.h"

View File

@@ -20,7 +20,7 @@
*/
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
#if defined(SDL_VIDEO_DRIVER_RPI) && SDL_VIDEO_OPENGL_EGL
#include "SDL_rpivideo.h"
#include "SDL_rpiopengles.h"

View File

@@ -23,7 +23,7 @@
#ifndef SDL_rpiopengles_h_
#define SDL_rpiopengles_h_
#if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
#if defined(SDL_VIDEO_DRIVER_RPI) && SDL_VIDEO_OPENGL_EGL
#include "../SDL_sysvideo.h"
#include "../SDL_egl_c.h"

View File

@@ -21,7 +21,7 @@
#include "SDL_internal.h"
#if SDL_VIDEO_DRIVER_RPI
#ifdef SDL_VIDEO_DRIVER_RPI
/* References
* http://elinux.org/RPi_VideoCore_APIs