Merge branch 'master'

diff --git a/Makefile b/Makefile
index 819c48ce8b4b6ae8389f401749d4fe0e34eaad9a..2d8853d69e72f28410023cc1773288354a02a31f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,10 @@ endif
 ifeq ($(uname_O),Cygwin)
        NO_STRCASESTR = YesPlease
        NEEDS_LIBICONV = YesPlease
+       # There are conflicting reports about this.
+       # On some boxes NO_MMAP is needed, and not so elsewhere.
+       # Try uncommenting this if you see things break -- YMMV.
+       # NO_MMAP = YesPlease
        NO_IPV6 = YesPlease
        X = .exe
        ALL_CFLAGS += -DUSE_SYMLINK_HEAD=0