aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaromir Wysoglad2019-08-25 01:04:54 +0200
committerDavid Turner2019-08-25 03:14:24 +0100
commit96fef166938c3f1b77d849f2a2ec36a206dad058 (patch)
treeff8787418d50e3c4d94c669585feaa9ca3b15c58
parente6bfda8e4902435bd2bc2b21365ec6db034a47ac (diff)
downloadscummvm-rg350-96fef166938c3f1b77d849f2a2ec36a206dad058.tar.gz
scummvm-rg350-96fef166938c3f1b77d849f2a2ec36a206dad058.tar.bz2
scummvm-rg350-96fef166938c3f1b77d849f2a2ec36a206dad058.zip
COMMON: Don't include config.h before scummsys.h
Thil should fix the ds build. For some reason I thought the forbidden.h wouldn't allow me to include the iconv.h, so I tryed to include it before the forbidden.h (it seems like I didn't have to do that.)
-rw-r--r--common/encoding.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/common/encoding.h b/common/encoding.h
index c8f864d2ec..11639cb40d 100644
--- a/common/encoding.h
+++ b/common/encoding.h
@@ -23,9 +23,9 @@
#ifndef COMMON_ENCODING_H
#define COMMON_ENCODING_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
+#include "common/scummsys.h"
+#include "common/str.h"
+#include "common/system.h"
#ifdef USE_ICONV
#include <iconv.h>
@@ -33,10 +33,6 @@
typedef void* iconv_t;
#endif // USE_ICONV
-#include "common/scummsys.h"
-#include "common/str.h"
-#include "common/system.h"
-
#ifdef WIN32
#include "backends/platform/sdl/win32/win32.h"
#endif