[Emacs-diffs] /srv/bzr/emacs/trunk r112409: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 112409
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-27 12:30:33 -0700
message:
  Merge from gnulib.
modified:
  ChangeLog
  lib/intprops.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-04-26 19:31:09 +0000
+++ b/ChangeLog 2013-04-27 19:30:33 +0000
@@ -1,3 +1,8 @@
+2013-04-27  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2013-04-27 alignof, intprops, malloca: port better to IBM's C compiler
+
 2013-04-26  Paul Eggert  <address@hidden>
 
        Port better to AIX (Bug#14258).

=== modified file 'lib/intprops.h'
--- a/lib/intprops.h    2013-01-01 09:11:05 +0000
+++ b/lib/intprops.h    2013-04-27 19:30:33 +0000
@@ -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