From: Bruno Haible <bruno@clisp.org>
Date: Mon, 6 Jul 2020 19:31:54 +0000 (+0200)
Subject: alloca-opt: Fix build error on AIX (regression from 2020-07-05).
X-Git-Tag: v0.21~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=208c5081819ceaafd1da7e097e6ec0a55d141b8f;p=thirdparty%2Fgettext.git

alloca-opt: Fix build error on AIX (regression from 2020-07-05).

* gnulib-local/lib/alloca.in.h: Don't include <alloca.h>, since it would be a
recursive include of the same file.
---

diff --git a/gnulib-local/lib/alloca.in.h b/gnulib-local/lib/alloca.in.h
index 56b9d9e77..1b5fb9d22 100644
--- a/gnulib-local/lib/alloca.in.h
+++ b/gnulib-local/lib/alloca.in.h
@@ -47,7 +47,10 @@
 # ifdef __GNUC__
 #  define alloca __builtin_alloca
 # else
-#  ifdef _MSC_VER
+#  if defined _AIX
+ #pragma alloca
+    /* Alternatively: #define alloca __alloca, works as well.  */
+#  elif defined _MSC_VER
 #   include <malloc.h>
 #   define alloca _alloca
 #  elif defined __DECC && defined __VMS
@@ -62,25 +65,17 @@ void *_alloca (unsigned short);
 #  elif defined __MVS__
 #   include <stdlib.h>
 #  else
-#   if HAVE_ALLOCA_H
-#    include <alloca.h>
-#   else
-#    ifdef _AIX
- #pragma alloca
-#    else
-#     ifdef __hpux /* This section must match that of bison generated files. */
-#      ifdef __cplusplus
+#   ifdef __hpux /* This section must match that of bison generated files. */
+#    ifdef __cplusplus
 extern "C" void *alloca (unsigned int);
-#      else /* not __cplusplus */
+#    else /* not __cplusplus */
 extern void *alloca ();
-#      endif /* not __cplusplus */
-#     else /* not __hpux */
-#      ifndef alloca
+#    endif /* not __cplusplus */
+#   else /* not __hpux */
+#    ifndef alloca
 extern char *alloca ();
-#      endif
-#     endif /* __hpux */
 #    endif
-#   endif
+#   endif /* __hpux */
 #  endif
 # endif
 #endif