Index: libffi/src/closures.c
===================================================================
--- libffi/src/closures.c	(revision 149030)
+++ libffi/src/closures.c	(working copy)
@@ -189,18 +189,18 @@
 /* Use these for mmap and munmap within dlmalloc.c.  */
 static void *dlmmap(void *, size_t, int, int, int, off_t);
 static int dlmunmap(void *, size_t);
-#endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
 
 #define mmap dlmmap
 #define munmap dlmunmap
+#endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
 
 #include "dlmalloc.c"
 
+#if !defined(X86_WIN32) && !defined(X86_WIN64)
+
 #undef mmap
 #undef munmap
 
-#if !defined(X86_WIN32) && !defined(X86_WIN64)
-
 /* A mutex used to synchronize access to *exec* variables in this file.  */
 static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER;