X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fargp-help.c;h=e82f488353fede5fce3f80a8c1f479b90c693b45;hb=fdae5d9f72a0596fc7b5933509a9cd03cbebf6eb;hp=14ee68661041979600113ceebd7e10ebd99790b1;hpb=f81666cf0bfd795a33feea079c6196ed7fc39f2b;p=gnulib.git

diff --git a/lib/argp-help.c b/lib/argp-help.c
index 14ee68661..e82f48835 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -25,20 +25,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