Merge lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands

[Tino]

Silence warnings about variable length arrays in gettext.h

Silence warnings about variable length arrays in gettext.h

[Tino (tino79)]

Ok, let's wait for feedback on MacOS and Appveyor.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1537. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/171762218.
Appveyor build 1379. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_gettext_compile_errors-1379.

[Klaus Halfmann (klaus-halfmann)]

compiles on OSX based on MacPorts, did not check anything else, yet

[GunChleoc (gunchleoc)]

Did you get any compiler warnings about variable length arrays in gettext.h? If not, this branch is good to go.

[Klaus Halfmann (klaus-halfmann)]

I now checked the compiled output again and found no such warnings. Just got waring about enums/switches, and things like

gettext-compile-errors/src/logic/map_objects/tribes/building.cc:664:22: warning: format
specifies type 'void *' but the argument has type 'Widelands::Flag *' [-Wformat-pedantic]
 molog("flag: %p\n", flag_);

perhpas we shoud drop those via -Wformat-pedantic

and this one:
gettext-compile-errors/src/graphic/text/bidi.cc:513:20: warning: disabled expansion of
      recursive macro [-Wdisabled-macro-expansion]

will now play a bit....

review: Approve (compile)

[GunChleoc (gunchleoc)]

Thanks, this makes this branch ready to merge.

The printf messages aren't that many and I'd like to keep them in, so we will get warnings about actual printf errors - those warnings have saved me from making errors many times.

@bunnybot merge

[Klaus Halfmann (klaus-halfmann)]

Actually my wife crushed half an Empire, aehm Imperial AI, using this branch, so there should not be anything serious inside

[GunChleoc (gunchleoc)]

Good for her :)

=== modified file 'src/third_party/gettext/gettext.h'
--- src/third_party/gettext/gettext.h	2016-08-04 15:49:05 +0000
+++ src/third_party/gettext/gettext.h	2016-10-30 12:39:29 +0000
@@ -158,12 +158,11 @@
 
 #include <string.h>
 
-#if (((__GNUC__ >= 3 || __GNUG__ >= 2) &&                                                          \
-      !defined __STRICT_ANSI__) /* || __STDC_VERSION__ >= 199901L */)
-#define GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 1
-#else
-#define GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS 0
-#endif
+ /* http://bug-gnulib.gnu.narkive.com/1Hoiy7Iw/c-support
+	 GCC supports variable-size arrays in C and C++ mode.
+	 ISO C++ supports variable-size arrays, but some older PGI and Sun compilers
+	 don't. */
+#define GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS !(__GNUC__ >= 3 || (defined __cplusplus && !(defined __PGI || defined __SUNPRO_CC)))
 
 #if !GETTEXT_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
 #include <stdlib.h>