rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* builds/unix/configure.raw [mmap support]: Explicitly handle Windows. 

Fixes #1024.
This commit is contained in:
Alexei Podtelezhnikov 2021-02-02 23:02:54 -05:00
parent 5635d5edc4
commit d3befe1c72
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

32
builds/unix/configure.raw
View File

@ -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])