summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-20 22:13:21 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-20 22:13:21 +0300
commitf59098892167f63ae1267553d80f8e396fa7f40e (patch)
treec6d83470cced05881b32dc87e8c216c6f22e8788
parent8167471e438210f4a81fca8d2c70f52bb736983f (diff)
downloadmv-f59098892167f63ae1267553d80f8e396fa7f40e.tar.gz
mv-f59098892167f63ae1267553d80f8e396fa7f40e.tar.bz2
mv-f59098892167f63ae1267553d80f8e396fa7f40e.tar.xz
mv-f59098892167f63ae1267553d80f8e396fa7f40e.zip
Remove extra includes and fix headers compilation.
-rw-r--r--src/graphicsmanager.h3
-rw-r--r--src/gui/widgets/staticbrowserbox.h1
-rw-r--r--src/render/opengl/mgltypes.h2
-rw-r--r--src/resources/iteminfo.h1
4 files changed, 1 insertions, 6 deletions
diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h
index 495bd3fca..6d0777d27 100644
--- a/src/graphicsmanager.h
+++ b/src/graphicsmanager.h
@@ -21,10 +21,9 @@
#ifndef GRAPHICSMANAGER_H
#define GRAPHICSMANAGER_H
-#ifdef USE_OPENGL
-
#include "localconsts.h"
+#ifdef USE_OPENGL
#ifdef ANDROID
#include <GLES/gl.h>
#else // ANDROID
diff --git a/src/gui/widgets/staticbrowserbox.h b/src/gui/widgets/staticbrowserbox.h
index 643f0a96f..e2d2bc1f9 100644
--- a/src/gui/widgets/staticbrowserbox.h
+++ b/src/gui/widgets/staticbrowserbox.h
@@ -26,7 +26,6 @@
#include "enums/simpletypes/opaque.h"
-#include "enums/gui/browserboxmode.h"
#include "enums/gui/colorname.h"
#include "gui/browserlink.h"
diff --git a/src/render/opengl/mgltypes.h b/src/render/opengl/mgltypes.h
index 2e76451f8..d6ad9fee5 100644
--- a/src/render/opengl/mgltypes.h
+++ b/src/render/opengl/mgltypes.h
@@ -57,8 +57,6 @@ RENDER_OPENGL_MGLDEFINES_H
#ifndef USE_SDL2
#if defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <cstdint>
-#else // defined(__GXX_EXPERIMENTAL_CXX0X__)
-#include <stdint.h>
#endif // defined(__GXX_EXPERIMENTAL_CXX0X__)
#endif // USE_SDL2
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 5d06a89e8..384626856 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -28,7 +28,6 @@
#include "enums/resources/item/itemdbtype.h"
#include "enums/simpletypes/beingtypeid.h"
-#include "enums/simpletypes/itemcolor.h"
#include "resources/cursors.h"
#include "resources/itemcolordata.h"