Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType
Commits:
-
fd7f92b6
by Alexei Podtelezhnikov at 2021-02-03T14:44:14-05:00
2 changed files:
Changes:
| 1 |
+2021-02-03 Alexei Podtelezhnikov <apodtele@gmail.com>
|
|
| 2 |
+ |
|
| 3 |
+ * builds/unix/configure.raw [mmap]: Restore default path.
|
|
| 4 |
+ |
|
| 5 |
+ Fixes #1023.
|
|
| 6 |
+ |
|
| 1 | 7 |
2021-02-03 Werner Lemberg <wl@gnu.org>
|
| 2 | 8 |
|
| 3 | 9 |
[psaux] Fix integer overflow.
|
| ... | ... | @@ -204,9 +204,8 @@ if test "x${enable_mmap}" != "xno"; then |
| 204 | 204 |
case "$host" in
|
| 205 | 205 |
*-*-mingw*)
|
| 206 | 206 |
AC_MSG_CHECKING([for working mmap])
|
| 207 |
- AC_MSG_RESULT([using Windows-specific equivalent])
|
|
| 207 |
+ AC_MSG_RESULT([using MapViewOfFile in Windows])
|
|
| 208 | 208 |
FTSYS_SRC='$(TOP_DIR)/builds/windows/ftsystem.c'
|
| 209 |
- AC_SUBST([FTSYS_SRC])
|
|
| 210 | 209 |
;;
|
| 211 | 210 |
*)
|
| 212 | 211 |
AC_FUNC_MMAP
|
| ... | ... | @@ -226,12 +225,17 @@ if test "x${enable_mmap}" != "xno"; then |
| 226 | 225 |
])
|
| 227 | 226 |
|
| 228 | 227 |
FT_MUNMAP_PARAM
|
| 229 |
- AC_SUBST([FTSYS_SRC])
|
|
| 230 | 228 |
fi
|
| 231 | 229 |
;;
|
| 232 | 230 |
esac
|
| 233 | 231 |
fi
|
| 234 | 232 |
|
| 233 |
+if test -z "$FTSYS_SRC"; then
|
|
| 234 |
+ FTSYS_SRC='$(BASE_DIR)/ftsystem.c'
|
|
| 235 |
+fi
|
|
| 236 |
+AC_SUBST([FTSYS_SRC])
|
|
| 237 |
+ |
|
| 238 |
+ |
|
| 235 | 239 |
AC_CHECK_FUNCS([memcpy memmove])
|
| 236 | 240 |
|
| 237 | 241 |
|