Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
d3befe1c
by Alexei Podtelezhnikov at 2021-02-02T23:02:54-05:00
2 changed files:
Changes:
| 1 |
+2021-02-02 Alexei Podtelezhnikov <apodtele@gmail.com>
|
|
| 2 |
+ |
|
| 3 |
+ * builds/unix/configure.raw [mmap support]: Explicitly handle Windows.
|
|
| 4 |
+ |
|
| 5 |
+ Fixes #1024.
|
|
| 6 |
+ |
|
| 1 | 7 |
2021-01-31 Werner Lemberg <wl@gnu.org>
|
| 2 | 8 |
|
| 3 | 9 |
* builds/unix/configure.raw [mmap support]: Correctly handle Windows.
|
| ... | ... | @@ -203,42 +203,34 @@ AC_ARG_ENABLE([mmap], |
| 203 | 203 |
if test "x${enable_mmap}" != "xno"; then
|
| 204 | 204 |
case "$host" in
|
| 205 | 205 |
*-*-mingw*)
|
| 206 |
- ac_cv_func_mmap_fixed_mapped="yes"
|
|
| 207 | 206 |
AC_MSG_CHECKING([for working mmap])
|
| 208 | 207 |
AC_MSG_RESULT([using Windows-specific equivalent])
|
| 208 |
+ FTSYS_SRC='$(TOP_DIR)/builds/windows/ftsystem.c'
|
|
| 209 |
+ AC_SUBST([FTSYS_SRC])
|
|
| 209 | 210 |
;;
|
| 210 | 211 |
*)
|
| 211 | 212 |
AC_FUNC_MMAP
|
| 212 |
- ;;
|
|
| 213 |
- esac
|
|
| 214 |
-fi
|
|
| 215 |
-if test "x${enable_mmap}" = "xno" \
|
|
| 216 |
- -o "$ac_cv_func_mmap_fixed_mapped" != "yes"; then
|
|
| 217 |
- FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
|
|
| 218 |
-else
|
|
| 219 |
- FTSYS_SRC='$(PLATFORM_DIR)/ftsystem.c'
|
|
| 213 |
+ if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then
|
|
| 214 |
+ FTSYS_SRC='$(PLATFORM_DIR)/ftsystem.c'
|
|
| 220 | 215 |
|
| 221 |
- case "$host" in
|
|
| 222 |
- *-*-mingw*)
|
|
| 223 |
- ;;
|
|
| 224 |
- *)
|
|
| 225 |
- AC_CHECK_DECLS([munmap],
|
|
| 226 |
- [],
|
|
| 227 |
- [],
|
|
| 228 |
- [
|
|
| 216 |
+ AC_CHECK_DECLS([munmap],
|
|
| 217 |
+ [],
|
|
| 218 |
+ [],
|
|
| 219 |
+ [
|
|
| 229 | 220 |
|
| 230 | 221 |
#ifdef HAVE_UNISTD_H
|
| 231 | 222 |
#include <unistd.h>
|
| 232 | 223 |
#endif
|
| 233 | 224 |
#include <sys/mman.h>
|
| 234 | 225 |
|
| 235 |
- ])
|
|
| 226 |
+ ])
|
|
| 236 | 227 |
|
| 237 |
- FT_MUNMAP_PARAM
|
|
| 228 |
+ FT_MUNMAP_PARAM
|
|
| 229 |
+ AC_SUBST([FTSYS_SRC])
|
|
| 230 |
+ fi
|
|
| 238 | 231 |
;;
|
| 239 | 232 |
esac
|
| 240 | 233 |
fi
|
| 241 |
-AC_SUBST([FTSYS_SRC])
|
|
| 242 | 234 |
|
| 243 | 235 |
AC_CHECK_FUNCS([memcpy memmove])
|
| 244 | 236 |
|