From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 27 Apr 2013 19:30:33 +0000 (-0700)
Subject: Merge from gnulib.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~353
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7ed9b364adba7fc3c627ccd02f0ab453a23c661;p=emacs.git

Merge from gnulib.
---

diff --git a/ChangeLog b/ChangeLog
index cf1d4f0d54e..a6dfed3dc56 100644
--- 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 b473052d114..f57f9b4ddab 100644
--- 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