[Scummvm-git-logs] scummvm master -> e2ab8198a79a79a389db0debee9e774df6dc2ee4

[digitall]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
96fef16693 COMMON: Don't include config.h before scummsys.h
e2ab8198a7 CONFIGURE: Check if iconv uses const.


Commit: 96fef166938c3f1b77d849f2a2ec36a206dad058
    https://github.com/scummvm/scummvm/commit/96fef166938c3f1b77d849f2a2ec36a206dad058
Author: Jaromir Wysoglad (jaromirwysoglad at gmail.com)
Date: 2019-08-25T03:14:24+01:00

Commit Message:
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.)

Changed paths:
    common/encoding.h


diff --git a/common/encoding.h b/common/encoding.h
index c8f864d..11639cb 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


Commit: e2ab8198a79a79a389db0debee9e774df6dc2ee4
    https://github.com/scummvm/scummvm/commit/e2ab8198a79a79a389db0debee9e774df6dc2ee4
Author: Jaromir Wysoglad (jaromirwysoglad at gmail.com)
Date: 2019-08-25T03:14:24+01:00

Commit Message:
CONFIGURE: Check if iconv uses const.

I looked at how ResidualVM works with iconv and used a define
ICONV_USES_CONST, which they define in configure, thinking it is
defined by iconv. I a define of this into configure, so this
should fix the build error on osx_intel.

Changed paths:
    configure


diff --git a/configure b/configure
index b458004..62eeee9 100755
--- a/configure
+++ b/configure
@@ -5240,6 +5240,20 @@ fi
 if test "$_iconv" = yes ; then
 	append_var LIBS "$ICONV_LIBS -liconv"
 	append_var INCLUDES "$ICONV_CFLAGS"
+
+# check if iconv uses const char** as it's second parameter
+	cat > $TMPC << EOF
+#include <iconv.h>
+int main(void) {
+	iconv_t conv = iconv_open("UTF-8//IGNORE", "CP850");
+	const char **inbuf = 0;
+	iconv(conv, inbuf, 0, 0, 0);
+	return 0;
+}
+EOF
+		_iconv_uses_const=no
+		cc_check $ICONV_CFLAGS $ICONV_LIBS -liconv && _iconv_uses_const=yes
+		define_in_config_if_yes "$_iconv_uses_const" 'ICONV_USES_CONST'
 fi
 define_in_config_if_yes "$_iconv" 'USE_ICONV'
 echo "$_iconv"