aboutsummaryrefslogtreecommitdiff
path: root/argp/argp-help.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-29 07:20:47 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-29 07:20:47 +0000
commitc5af724c0b214a517f8558887f7a70efcfa2c813 (patch)
tree8b1b822c45022d0bf414d1fc9a41794b17900410 /argp/argp-help.c
parent0a76d15e91c26aae360749b4eb75559971e4fcfb (diff)
downloadglibc-c5af724c0b214a517f8558887f7a70efcfa2c813.tar
glibc-c5af724c0b214a517f8558887f7a70efcfa2c813.tar.gz
glibc-c5af724c0b214a517f8558887f7a70efcfa2c813.tar.bz2
glibc-c5af724c0b214a517f8558887f7a70efcfa2c813.zip
Update.
2003-10-10 Simon Josefsson <jas@extundo.com> * argp/argp-namefrob.h [!_LIBC]: Include mempcpy.h, strcase.h, strchrnul.h, strndup.h (from gnulib). * argp/argp-parse.c: Add alloca.h include snippet verbatim from Autoconf manual. * argp/argp-help.c: Replace alloca.h include snipper with verbatim Autoconf manual version. * argp/argp.h: Map __restrict to restrict or empty string when necessary, copied verbatim from posix/regex.h.
Diffstat (limited to 'argp/argp-help.c')
-rw-r--r--argp/argp-help.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/argp/argp-help.c b/argp/argp-help.c
index 1365abcea6..b7e088ef10 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -26,20 +26,16 @@
#include <config.h>
#endif
-#ifndef alloca
-# ifdef __GNUC__
-# define alloca __builtin_alloca
-# define HAVE_ALLOCA 1
+/* AIX requires this to be the first thing in the file. */
+#ifndef __GNUC__
+# if HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
# else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
+# ifdef _AIX
+#pragma alloca
# else
-# ifdef _AIX
- #pragma alloca
-# else
-# ifndef alloca
+# ifndef alloca /* predefined by HP cc +Olibcalls */
char *alloca ();
-# endif
# endif
# endif
# endif