summaryrefslogtreecommitdiff
path: root/libffi/src
diff options
context:
space:
mode:
authorDave Korn <dave.korn.cygwin@gmail.com>2013-03-07 22:25:20 +0000
committerDave Korn <davek@gcc.gnu.org>2013-03-07 22:25:20 +0000
commitbb78d7c4a29da63495b98668a6de10457920b6d9 (patch)
tree887fb8b7efcbbd0dd62dc304e53ba85fb931383a /libffi/src
parentc4c2f9fa57d529def134eb95c0a9702aec7b3002 (diff)
closures.c (is_emutramp_enabled [!FFI_MMAP_EXEC_EMUTRAMP_PAX]): Move default definition outside enclosing #if scope.
* src/closures.c (is_emutramp_enabled [!FFI_MMAP_EXEC_EMUTRAMP_PAX]): Move default definition outside enclosing #if scope. From-SVN: r196527
Diffstat (limited to 'libffi/src')
-rw-r--r--libffi/src/closures.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libffi/src/closures.c b/libffi/src/closures.c
index fecbc4ae2c9..6298d6f0c4d 100644
--- 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*);