Merge from gnulib.

diff --git a/ChangeLog b/ChangeLog
index cf1d4f0d54ed663c9b9cb4ef2f08e699483515a8..a6dfed3dc5614fd7132b223c8cdabd958dd9f4dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib, incorporating:
+       2013-04-27 alignof, intprops, malloca: port better to IBM's C compiler
+
 2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        Port better to AIX (Bug#14258).

diff --git a/lib/intprops.h b/lib/intprops.h
index b473052d11483098bd69bbce725cc1b582d5df35..f57f9b4ddab25cf228f3c736e05cda6a6690c86d 100644 (file)
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -89,7 +89,7 @@
 
 /* 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__ || 0x5110 <= __SUNPRO_C
+#if 2 <= __GNUC__ || defined __IBM__TYPEOF__ || 0x5110 <= __SUNPRO_C
 # define _GL_HAVE___TYPEOF__ 1
 #else
 # define _GL_HAVE___TYPEOF__ 0