From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 10 Apr 2019 20:42:11 +0000 (+0300)
Subject: Fix 'USE_MUNMAP requires USE_MMAP' compilation error on Cygwin
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a260224209278e30a1c38440bb947cb06b51955;p=gc

Fix 'USE_MUNMAP requires USE_MMAP' compilation error on Cygwin
(fix of commit fdb655334)

* include/private/gcconfig.h [CYGWIN32] (MMAP_SUPPORTED): Do not define
if USE_WINALLOC.
---

diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h
index 16ce7ab1..c7d8e00a 100644
--- a/include/private/gcconfig.h
+++ b/include/private/gcconfig.h
@@ -3106,10 +3106,11 @@ EXTERN_C_BEGIN
 # undef USE_MMAP
 #endif
 
-#if defined(CYGWIN32) || defined(DARWIN) || defined(FREEBSD) \
-    || defined(HAIKU) || defined(IRIX5) || defined(LINUX) || defined(NETBSD) \
+#if defined(DARWIN) || defined(FREEBSD) || defined(HAIKU) \
+    || defined(IRIX5) || defined(LINUX) || defined(NETBSD) \
     || defined(OPENBSD) || defined(SOLARIS) \
-    || ((defined(USE_MMAP) || defined(USE_MUNMAP)) && !defined(USE_WINALLOC))
+    || ((defined(CYGWIN32) || defined(USE_MMAP) || defined(USE_MUNMAP)) \
+        && !defined(USE_WINALLOC))
   /* Try both sbrk and mmap, in that order.     */
 # define MMAP_SUPPORTED
 #endif