From fd7f92b6f008e0684c3eb8308aca92e20382506e Mon Sep 17 00:00:00 2001 From: Alexei Podtelezhnikov Date: Wed, 3 Feb 2021 14:44:14 -0500 Subject: [PATCH] * builds/unix/configure.raw [mmap]: Restore default path. Fixes #1023. --- ChangeLog | 6 ++++++ builds/unix/configure.raw | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f4af4eb6..05884b046 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-02-03 Alexei Podtelezhnikov + + * builds/unix/configure.raw [mmap]: Restore default path. + + Fixes #1023. + 2021-02-03 Werner Lemberg [psaux] Fix integer overflow. diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 816d6b874..c0c8592de 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -204,9 +204,8 @@ if test "x${enable_mmap}" != "xno"; then case "$host" in *-*-mingw*) AC_MSG_CHECKING([for working mmap]) - AC_MSG_RESULT([using Windows-specific equivalent]) + AC_MSG_RESULT([using MapViewOfFile in Windows]) FTSYS_SRC='$(TOP_DIR)/builds/windows/ftsystem.c' - AC_SUBST([FTSYS_SRC]) ;; *) AC_FUNC_MMAP @@ -226,12 +225,17 @@ if test "x${enable_mmap}" != "xno"; then ]) FT_MUNMAP_PARAM - AC_SUBST([FTSYS_SRC]) fi ;; esac fi +if test -z "$FTSYS_SRC"; then + FTSYS_SRC='$(BASE_DIR)/ftsystem.c' +fi +AC_SUBST([FTSYS_SRC]) + + AC_CHECK_FUNCS([memcpy memmove])