widelands-dev team mailing list archive

[Tino <tino.miegel@xxxxxxxxxxxxxx>]

Tino has proposed merging lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/gettext-compile-errors/+merge/309638

Merge request for appveyor building.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gettext-compile-errors into lp:widelands.

=== 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>