summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-20 18:54:43 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-20 18:54:43 +0300
commite7062838351fc67ab63a4780a25365dac4115005 (patch)
tree1b5fdb520c7c1a3ddf8f173fab75f1502595600e /src
parent5e37f24550e133d985945bb008782df543e1f428 (diff)
downloadmv-e7062838351fc67ab63a4780a25365dac4115005.tar.gz
mv-e7062838351fc67ab63a4780a25365dac4115005.tar.bz2
mv-e7062838351fc67ab63a4780a25365dac4115005.tar.xz
mv-e7062838351fc67ab63a4780a25365dac4115005.zip
Fix compilation with SDL2.
Diffstat (limited to 'src')
-rw-r--r--src/resources/sdlimagehelper_unittest.cc2
-rw-r--r--src/sdl2gfx/SDL2_framerate.h2
-rw-r--r--src/sdl2gfx/SDL2_rotozoom.h2
3 files changed, 5 insertions, 1 deletions
diff --git a/src/resources/sdlimagehelper_unittest.cc b/src/resources/sdlimagehelper_unittest.cc
index a71c6a21f..517054b1b 100644
--- a/src/resources/sdlimagehelper_unittest.cc
+++ b/src/resources/sdlimagehelper_unittest.cc
@@ -19,6 +19,7 @@
*/
#ifndef USE_SDL2
+#include "localconsts.h"
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_endian.h>
@@ -41,7 +42,6 @@ PRAGMA48(GCC diagnostic pop)
#include "resources/sdlimagehelper.h"
-
#include "debug.h"
static SDL_Surface *createSoftware32BitSurface(int width,
diff --git a/src/sdl2gfx/SDL2_framerate.h b/src/sdl2gfx/SDL2_framerate.h
index 271c4b986..4361b1f60 100644
--- a/src/sdl2gfx/SDL2_framerate.h
+++ b/src/sdl2gfx/SDL2_framerate.h
@@ -38,6 +38,8 @@ extern "C"
/* --- */
+#include "localconsts.h"
+
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL.h>
diff --git a/src/sdl2gfx/SDL2_rotozoom.h b/src/sdl2gfx/SDL2_rotozoom.h
index 07587c58c..3ae52888e 100644
--- a/src/sdl2gfx/SDL2_rotozoom.h
+++ b/src/sdl2gfx/SDL2_rotozoom.h
@@ -42,6 +42,8 @@ extern "C"
#define M_PI 3.1415926535897932384626433832795
#endif
+#include "localconsts.h"
+
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL.h>