From 1977d9222423c08a3a451497b1d034ade224d7b8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 May 2020 14:01:54 +0300 Subject: Split multi line #if into separate ifs --- src/render/modernopenglgraphics.cpp | 8 ++++---- src/render/modernopenglgraphics.h | 5 +++-- src/render/normalopenglgraphics.h | 9 +++++---- 3 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/render') diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp index 5f2fd7ddd..e99f9440c 100644 --- a/src/render/modernopenglgraphics.cpp +++ b/src/render/modernopenglgraphics.cpp @@ -20,8 +20,8 @@ * along with this program. If not, see . */ -#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) \ - && !defined(__SWITCH__) +#ifdef USE_OPENGL +#if !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) #include "render/modernopenglgraphics.h" @@ -1402,5 +1402,5 @@ void ModernOpenGLGraphics::debugBindTexture(const Image *restrict const } #endif // DEBUG_BIND_TEXTURE -#endif // defined(USE_OPENGL) && !defined(ANDROID) && - // !defined(__native_client__) +#endif // !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) +#endif // USE_OPENGL diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h index d5a9baf88..4362ea20d 100644 --- a/src/render/modernopenglgraphics.h +++ b/src/render/modernopenglgraphics.h @@ -23,8 +23,8 @@ #ifndef RENDER_MODERNOPENGLGRAPHICS_H #define RENDER_MODERNOPENGLGRAPHICS_H -#if defined(USE_OPENGL) && !defined(ANDROID) && \ - !defined(__native_client__) && !defined(__SWITCH__) +#ifdef USE_OPENGL +#if !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) #include "localconsts.h" @@ -156,5 +156,6 @@ class ModernOpenGLGraphics final : public Graphics }; #endif // defined(USE_OPENGL) && !defined(ANDROID) && // !defined(__native_client__) +#endif // USE_OPENGL #endif // RENDER_MODERNOPENGLGRAPHICS_H diff --git a/src/render/normalopenglgraphics.h b/src/render/normalopenglgraphics.h index 9964a61b8..8d3b23180 100644 --- a/src/render/normalopenglgraphics.h +++ b/src/render/normalopenglgraphics.h @@ -23,8 +23,8 @@ #ifndef RENDER_NORMALOPENGLGRAPHICS_H #define RENDER_NORMALOPENGLGRAPHICS_H -#if defined USE_OPENGL && !defined ANDROID && \ - !defined(__native_client__) && !defined(__SWITCH__) +#ifdef USE_OPENGL +#if !defined(ANDROID) && !defined(__native_client__) && !defined(__SWITCH__) #include "localconsts.h" @@ -128,7 +128,8 @@ class NormalOpenGLGraphics final : public Graphics FBOInfo mFbo; }; -#endif // defined USE_OPENGL && !defined ANDROID && - // !defined(__native_client__) +#endif // !defined ANDROID && !defined(__native_client__) && + // !defined(__SWITCH__) +#endif // USE_OPENGL #endif // RENDER_NORMALOPENGLGRAPHICS_H -- cgit v1.2.3-60-g2f50