From: Bruno Haible <bruno@clisp.org>
Date: Wed, 25 Oct 2006 16:14:34 +0000 (+0000)
Subject: Avoid compilation errors with some C++ compilers.
X-Git-Tag: cvs-readonly~1650
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=34abd68afd21ed0a91033624de782893ea102562;p=gnulib.git

Avoid compilation errors with some C++ compilers.
---

diff --git a/ChangeLog b/ChangeLog
index 58f53df65..b3cc38c9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+	* lib/gettext.h (_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS): Define to
+	false for PGI C++ and Sun C++ compilers.
+	Reported by Nelson H. F. Beebe <beebe@math.utah.edu>.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
 	* lib/striconv.c (mem_cd_iconv, str_cd_iconv): Treat all non-GNU
diff --git a/lib/gettext.h b/lib/gettext.h
index 70e2c1c26..6e4d5ead8 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -163,8 +163,12 @@ npgettext_aux (const char *domain,
 
 #include <string.h>
 
+/* 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 _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
-  (__GNUC__ >= 3 || defined __cplusplus)
+  (__GNUC__ >= 3 \
+   || (defined __cplusplus && !(defined __PGI || defined __SUNPRO_CC)))
 
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
 #include <stdlib.h>