* lib/intprops.h (_GL_HAVE___TYPEOF__) [__SUNPRO_C && __STDC__]:
Define to 0, to avoid diagnostics when Oracle Studio is pedantic.
---
 ChangeLog      | 6 ++++++
 lib/intprops.h | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 009382c..a9cac6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-03  Paul Eggert  <egg...@cs.ucla.edu>
+
+       intprops: port to Oracle Studio c99
+       * lib/intprops.h (_GL_HAVE___TYPEOF__) [__SUNPRO_C && __STDC__]:
+       Define to 0, to avoid diagnostics when Oracle Studio is pedantic.
+
 2013-10-31  Paul Eggert  <egg...@cs.ucla.edu>
 
        obstack: pacify HP C
diff --git a/lib/intprops.h b/lib/intprops.h
index f57f9b4..1d2deb7 100644
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -89,7 +89,8 @@
 
 /* Return 1 if the __typeof__ keyword works.  This could be done by
    'configure', but for now it's easier to do it by hand.  */
-#if 2 <= __GNUC__ || defined __IBM__TYPEOF__ || 0x5110 <= __SUNPRO_C
+#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
+     || (0x5110 <= __SUNPRO_C && !__STDC__))
 # define _GL_HAVE___TYPEOF__ 1
 #else
 # define _GL_HAVE___TYPEOF__ 0
-- 
1.8.3.1


Reply via email to