Commit d3befe1c72999805bc3960d29780cd8f505a180d
2021-02-02T23:02:54
* builds/unix/configure.raw [mmap support]: Explicitly handle Windows. Fixes #1024.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/ChangeLog b/ChangeLog
index 64bf771..f1a2106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-02-02 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ * builds/unix/configure.raw [mmap support]: Explicitly handle Windows.
+
+ Fixes #1024.
+
2021-01-31 Werner Lemberg <wl@gnu.org>
* builds/unix/configure.raw [mmap support]: Correctly handle Windows.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index ce0c83f..816d6b8 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -203,42 +203,34 @@ AC_ARG_ENABLE([mmap],
if test "x${enable_mmap}" != "xno"; then
case "$host" in
*-*-mingw*)
- ac_cv_func_mmap_fixed_mapped="yes"
AC_MSG_CHECKING([for working mmap])
AC_MSG_RESULT([using Windows-specific equivalent])
+ FTSYS_SRC='$(TOP_DIR)/builds/windows/ftsystem.c'
+ AC_SUBST([FTSYS_SRC])
;;
*)
AC_FUNC_MMAP
- ;;
- esac
-fi
-if test "x${enable_mmap}" = "xno" \
- -o "$ac_cv_func_mmap_fixed_mapped" != "yes"; then
- FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
-else
- FTSYS_SRC='$(PLATFORM_DIR)/ftsystem.c'
+ if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
+ FTSYS_SRC='$(PLATFORM_DIR)/ftsystem.c'
- case "$host" in
- *-*-mingw*)
- ;;
- *)
- AC_CHECK_DECLS([munmap],
- [],
- [],
- [
+ AC_CHECK_DECLS([munmap],
+ [],
+ [],
+ [
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <sys/mman.h>
- ])
+ ])
- FT_MUNMAP_PARAM
+ FT_MUNMAP_PARAM
+ AC_SUBST([FTSYS_SRC])
+ fi
;;
esac
fi
-AC_SUBST([FTSYS_SRC])
AC_CHECK_FUNCS([memcpy memmove])