summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-18 17:05:04 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-18 17:05:04 +0300
commitb6d83c911a9a11876f60e1c63181f093d98a37ba (patch)
tree9eb20a454d83e74b684eb635d1d6c3c0c1ba4888 /src
parent0034c2c7ee0a644aac9d43e2d37661dc89e96003 (diff)
downloadmanaverse-b6d83c911a9a11876f60e1c63181f093d98a37ba.tar.gz
manaverse-b6d83c911a9a11876f60e1c63181f093d98a37ba.tar.bz2
manaverse-b6d83c911a9a11876f60e1c63181f093d98a37ba.tar.xz
manaverse-b6d83c911a9a11876f60e1c63181f093d98a37ba.zip
Remove extra includes.
Diffstat (limited to 'src')
-rw-r--r--src/resources/openglimagehelper.cpp5
-rw-r--r--src/resources/safeopenglimagehelper.cpp5
-rw-r--r--src/resources/sdlimagehelper.cpp5
3 files changed, 0 insertions, 15 deletions
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 6c30c6a73..21d56e500 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -46,11 +46,6 @@
#include "utils/checkutils.h"
#include "utils/sdlcheckutils.h"
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_image.h>
-PRAGMA48(GCC diagnostic pop)
-
#include "debug.h"
#ifndef SDL_BIG_ENDIAN
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index 2fcff7eb0..00e37e9aa 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -42,11 +42,6 @@
#include "utils/sdlcheckutils.h"
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_image.h>
-PRAGMA48(GCC diagnostic pop)
-
#include "debug.h"
#ifndef SDL_BIG_ENDIAN
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index fecd11482..d941931e4 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -32,11 +32,6 @@
#include "utils/checkutils.h"
#include "utils/sdlcheckutils.h"
-PRAGMA48(GCC diagnostic push)
-PRAGMA48(GCC diagnostic ignored "-Wshadow")
-#include <SDL_image.h>
-PRAGMA48(GCC diagnostic pop)
-
#include "localconsts.h"
#if SDL_BYTEORDER == SDL_LIL_ENDIAN