closures.c (is_emutramp_enabled [!FFI_MMAP_EXEC_EMUTRAMP_PAX]): Move default definiti...

	* src/closures.c (is_emutramp_enabled [!FFI_MMAP_EXEC_EMUTRAMP_PAX]):
	Move default definition outside enclosing #if scope.

From-SVN: r196527

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index ab2aee6a9a04628050286edbc5a2afda93299e0a..57cf35672130f6bad8353925ac36e7752536ec10 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-07  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * src/closures.c (is_emutramp_enabled [!FFI_MMAP_EXEC_EMUTRAMP_PAX]):
+       Move default definition outside enclosing #if scope.
+
 2013-02-06  Andreas Tobler  <andreast@fgznet.ch>
 
        * src/powerpc/ffi.c (ffi_prep_cif_machdep): Fix case where

diff --git a/libffi/src/closures.c b/libffi/src/closures.c
index fecbc4ae2c9e7056e84c2561f6537e453ea7efc7..6298d6f0c4de8cb2fa23897949b1e63233597787 100644 (file)
--- a/libffi/src/closures.c
+++ b/libffi/src/closures.c
@@ -189,8 +189,6 @@ emutramp_enabled_check (void)
 
 #define is_emutramp_enabled() (emutramp_enabled >= 0 ? emutramp_enabled \
                                : (emutramp_enabled = emutramp_enabled_check ()))
-#else
-#define is_emutramp_enabled() 0
 #endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */
 
 #elif defined (__CYGWIN__) || defined(__INTERIX)
@@ -202,6 +200,10 @@ emutramp_enabled_check (void)
 
 #endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
 
+#ifndef FFI_MMAP_EXEC_EMUTRAMP_PAX
+#define is_emutramp_enabled() 0
+#endif /* FFI_MMAP_EXEC_EMUTRAMP_PAX */
+
 /* Declare all functions defined in dlmalloc.c as static.  */
 static void *dlmalloc(size_t);
 static void dlfree(void*);