summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-07 20:39:07 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-07 20:39:07 +0300
commitc2d2197d7d70dc1090bcdddca3dc04fc0a8d7744 (patch)
treef0a06acf9af3299dc6701d273b386681de1b0df3
parentf86a584d8f19a06d06acaef3ad1f9d3eef4690ad (diff)
downloadmv-c2d2197d7d70dc1090bcdddca3dc04fc0a8d7744.tar.gz
mv-c2d2197d7d70dc1090bcdddca3dc04fc0a8d7744.tar.bz2
mv-c2d2197d7d70dc1090bcdddca3dc04fc0a8d7744.tar.xz
mv-c2d2197d7d70dc1090bcdddca3dc04fc0a8d7744.zip
Remove extra include SDL_stdinc.h.
-rw-r--r--src/input/keyboardconfig.h11
-rw-r--r--src/logger.h11
-rw-r--r--src/net/sdltcpnet.h12
-rw-r--r--src/resources/screenshothelper.h12
-rw-r--r--src/soundmanager.h11
-rw-r--r--src/utils/buildhex.h12
-rw-r--r--src/utils/physfsrwops.h11
-rw-r--r--src/utils/sdl2helper.h8
8 files changed, 0 insertions, 88 deletions
diff --git a/src/input/keyboardconfig.h b/src/input/keyboardconfig.h
index b022ad13d..259fb650e 100644
--- a/src/input/keyboardconfig.h
+++ b/src/input/keyboardconfig.h
@@ -25,17 +25,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
#include <SDL_events.h>
#include "sdlshared.h"
diff --git a/src/logger.h b/src/logger.h
index aafe50428..117050272 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -25,17 +25,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
#include <SDL_mutex.h>
#include <fstream>
diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h
index dda5f0aec..4730858e7 100644
--- a/src/net/sdltcpnet.h
+++ b/src/net/sdltcpnet.h
@@ -23,18 +23,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
-
#include <SDL_net.h>
namespace TcpNet
diff --git a/src/resources/screenshothelper.h b/src/resources/screenshothelper.h
index 6ae396cd0..cb4180147 100644
--- a/src/resources/screenshothelper.h
+++ b/src/resources/screenshothelper.h
@@ -25,18 +25,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
-
#include <SDL_video.h>
class ScreenshotHelper notfinal
diff --git a/src/soundmanager.h b/src/soundmanager.h
index ae17552e8..7326efee6 100644
--- a/src/soundmanager.h
+++ b/src/soundmanager.h
@@ -29,17 +29,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
#include <SDL_mixer.h>
class SDLMusic;
diff --git a/src/utils/buildhex.h b/src/utils/buildhex.h
index 39a9aa817..ac9773070 100644
--- a/src/utils/buildhex.h
+++ b/src/utils/buildhex.h
@@ -23,18 +23,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
-
#ifndef SDL_BIG_ENDIAN
#include <SDL_endian.h>
#endif // SDL_BYTEORDER
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index b72c5969d..6917afc5d 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -27,17 +27,6 @@
#include "localconsts.h"
-#ifdef USE_SDL2
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(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
-PRAGMA45(GCC diagnostic pop)
-#endif // USE_SDL2
#include <SDL_rwops.h>
#include "utils/physfstools.h"
diff --git a/src/utils/sdl2helper.h b/src/utils/sdl2helper.h
index 9be1c25e5..5b95d6ebf 100644
--- a/src/utils/sdl2helper.h
+++ b/src/utils/sdl2helper.h
@@ -26,14 +26,6 @@
#include "localconsts.h"
-PRAGMA45(GCC diagnostic push)
-PRAGMA45(GCC diagnostic ignored "-Wswitch-default")
-#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_)
-
-PRAGMA45(GCC diagnostic pop)
#include <SDL_thread.h>
struct SDL_Surface;