From: Anthony Green <green@moxielogic.com>
Date: Wed, 13 Nov 2013 21:40:28 +0000 (-0500)
Subject: Respect HAVE_ALLOCA_H
X-Git-Tag: v3.1~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8af42f9944f7ed72c81ae360aac6a84dc11f89dc;p=platform%2Fupstream%2Flibffi.git

Respect HAVE_ALLOCA_H
---

diff --git a/ChangeLog b/ChangeLog
index 87a979a..3cb6188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Anthony Green  <green@moxielogic.com>
+
+	* include/ffi_common.h: Respect HAVE_ALLOCA_H for GNU compiler
+	based build. (Thanks to tmr111116 on github)
+
 2013-11-09  Anthony Green  <green@moxielogic.com>
 
 	* m4/libtool.m4: Refresh.
diff --git a/include/ffi_common.h b/include/ffi_common.h
index 650ca69..37f5a9e 100644
--- a/include/ffi_common.h
+++ b/include/ffi_common.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
-   ffi_common.h - Copyright (C) 2011, 2012  Anthony Green
+   ffi_common.h - Copyright (C) 2011, 2012, 2013  Anthony Green
                   Copyright (C) 2007  Free Software Foundation, Inc
                   Copyright (c) 1996  Red Hat, Inc.
                   
@@ -19,10 +19,14 @@ extern "C" {
 /* Do not move this. Some versions of AIX are very picky about where
    this is positioned. */
 #ifdef __GNUC__
-/* mingw64 defines this already in malloc.h. */
-#ifndef alloca
-# define alloca __builtin_alloca
-#endif
+# if HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+  /* mingw64 defines this already in malloc.h. */
+#  ifndef alloca
+#    define alloca __builtin_alloca
+#  endif
+# endif
 # define MAYBE_UNUSED __attribute__((__unused__))
 #else
 # define MAYBE_UNUSED
@@ -30,17 +34,17 @@ extern "C" {
 #  include <alloca.h>
 # else
 #  ifdef _AIX
- #pragma alloca
+#   pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 #    ifdef _MSC_VER
 #     define alloca _alloca
 #    else
 char *alloca ();
-#    endif
 #   endif
 #  endif
 # endif
+# endif
 #endif
 
 /* Check for the existence of memcpy. */