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

[Paul Eggert]

------------------------------------------------------------
revno: 108859
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-04 01:35:34 -0700
message:
  Merge from gnulib.
  
  * lib/alloca.in.h: New version from gnulib, incorporating:
  2012-07-03 alloca: add support for HP NonStop TNS/E native
modified:
  ChangeLog
  lib/alloca.in.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-04 08:07:26 +0000
+++ b/ChangeLog 2012-07-04 08:35:34 +0000
@@ -1,3 +1,9 @@
+2012-07-04  Paul Eggert  <address@hidden>
+
+       Merge from gnulib.
+       * lib/alloca.in.h: New version from gnulib, incorporating:
+       2012-07-03 alloca: add support for HP NonStop TNS/E native
+
 2012-07-04  Dmitry Antipov  <address@hidden>
 
        * configure.in: If --enable-gcc-warnings, disable

=== modified file 'lib/alloca.in.h'
--- a/lib/alloca.in.h   2012-05-26 23:14:36 +0000
+++ b/lib/alloca.in.h   2012-07-04 08:35:34 +0000
@@ -44,6 +44,13 @@
 #  define alloca _alloca
 # elif defined __DECC && defined __VMS
 #  define alloca __ALLOCA
+# elif defined __TANDEM && defined _TNS_E_TARGET
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *_alloca (unsigned short);
+#  pragma intrinsic (_alloca)
+#  define alloca _alloca
 # else
 #  include <stddef.h>
 #  ifdef  __cplusplus