1 files changed, 15 insertions, 8 deletions

diff --git a/lib-src/etags.c b/lib-src/etags.c
index dd1153e2054..a829fdc35a8 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -35,15 +35,22 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "getopt.h"
 
-#ifdef  __GNUC__
-#define alloca  __builtin_alloca
-#else
-#ifdef  sparc
-#include <alloca.h>
-#else
-extern char *alloca ();
-#endif
+/* AIX requires this to be the first thing in the file. */
+#ifdef __GNUC__
+#ifndef alloca
+#define alloca __builtin_alloca
 #endif
+#else /* not __GNUC__ */
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#else /* not HAVE_ALLOCA_H */
+#ifdef _AIX
+ #pragma alloca
+#else /* not _AIX */
+char *alloca ();
+#endif /* not _AIX */
+#endif /* not HAVE_ALLOCA_H */
+#endif /* not __GNUC__ */
 
 extern char *malloc (), *realloc ();
 extern char *getenv ();