@@ -56,19 +56,15 @@
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
-#elif defined __GNUC__
-# ifndef WIN32
+#elif !defined alloca
+# ifdef __GNUC__
# define alloca __builtin_alloca
-# else
+# elif defined _AIX
+# define alloca __alloca
+# elif defined _MSC_VER
# include <malloc.h>
-# endif
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# ifndef HAVE_ALLOCA
+# define alloca _alloca
+# elif !defined HAVE_ALLOCA
# ifdef __cplusplus
extern "C"
# endif