summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-04 01:47:32 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-04 03:37:37 +0300
commit7a77bf630d5588aaa73930fc761cda278e01add9 (patch)
treeb8847d79adf02af5ab5f2095064d70f05c3f866c /src
parent44fd594631f0d4ae437c4e504d74940b58cc445e (diff)
downloadmv-7a77bf630d5588aaa73930fc761cda278e01add9.tar.gz
mv-7a77bf630d5588aaa73930fc761cda278e01add9.tar.bz2
mv-7a77bf630d5588aaa73930fc761cda278e01add9.tar.xz
mv-7a77bf630d5588aaa73930fc761cda278e01add9.zip
Fix compilation with very new SDL2.
Diffstat (limited to 'src')
-rw-r--r--src/input/keyboardconfig.h4
-rw-r--r--src/logger.h4
-rw-r--r--src/net/sdltcpnet.h4
-rw-r--r--src/resources/screenshothelper.h4
-rw-r--r--src/soundmanager.h4
-rw-r--r--src/utils/buildhex.h4
-rw-r--r--src/utils/physfsrwops.h4
-rw-r--r--src/utils/sdl2helper.h4
8 files changed, 24 insertions, 8 deletions
diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h
index 454b19b3f..a6f5ba310 100644
--- a/src/input/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -28,7 +28,9 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
diff --git a/src/logger.h b/src/logger.h
index b9a7033be..a0d95d432 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -28,7 +28,9 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index f6dbd906f..194438782 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -26,7 +26,9 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
diff --git a/src/resources/screenshothelper.h b/src/resources/screenshothelper.h
index c66ed1e52..e37db92ed 100644
--- a/src/resources/screenshothelper.h
+++ b/src/resources/screenshothelper.h
@@ -28,11 +28,13 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
-_SDL_stdinc_h
#include <SDL_video.h>
#include "localconsts.h"
diff --git a/src/soundmanager.h b/src/soundmanager.h
index 799e71192..dae6ba0eb 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -28,7 +28,9 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h
index a7bcb7cda..0e728fed0 100644
--- a/src/utils/buildhex.h
+++ b/src/utils/buildhex.h
@@ -26,7 +26,9 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index 7874a8920..44e174814 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -30,7 +30,9 @@
#pragma GCC diagnostic ignored "-Wswitch-default"
#endif // USE_SDL2
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#ifdef USE_SDL2
#pragma GCC diagnostic pop
#endif // USE_SDL2
diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h
index 94567a25c..8e1333e16 100644
--- a/src/utils/sdl2helper.h
+++ b/src/utils/sdl2helper.h
@@ -27,7 +27,9 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wswitch-default"
#include <SDL_stdinc.h>
-_SDL_stdinc_h
+#if !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_) && !defined(SDL_stdinc_h)
+#error need include SDL_stdinc.h
+#endif // !defined(_SDL_stdinc_h) && !defined(SDL_stdinc_h_)
#pragma GCC diagnostic pop
#include <SDL_thread.h>