summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-07-04 01:35:34 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-07-04 01:35:34 -0700
commit013aabf1249f5b96b4a848738d5faab38a287fc6 (patch)
treec8fa057904602a28cd0f02283de0fdb4a3d5700a
parentc7f2cd7fd629e6af07eaa2354eda1b7bc81b22aa (diff)
Merge from gnulib.
* lib/alloca.in.h: New version from gnulib, incorporating: 2012-07-03 alloca: add support for HP NonStop TNS/E native
-rw-r--r--ChangeLog6
-rw-r--r--lib/alloca.in.h7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 95f0f0c1a2..ce247c8412 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-04 Paul Eggert <eggert@cs.ucla.edu>
+
+ 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 <dmantipov@yandex.ru>
* configure.in: If --enable-gcc-warnings, disable
diff --git a/lib/alloca.in.h b/lib/alloca.in.h
index e94eb68c3c..d20f4b8f1c 100644
--- a/lib/alloca.in.h
+++ b/lib/alloca.in.h
@@ -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