From 0596d7296c94b2bb9817338b8c1a76da91673fb9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 17 Sep 2006 17:03:33 -0700 Subject: [PATCH] More fixes for Win32 building (bug 8311) Our build system barfs on autogen.sh, which ignores --noconfigure. Configure needs a host of options to make the cross compile work in our case. Fix typo in fccache.c --- autogen.sh | 7 +++++++ src/fccache.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index d9bed63..c3d11ca 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,6 +6,13 @@ set -e srcdir=`dirname $0` test -z "$srcdir" && srcdir=. +case "$1" in +--noconf*) + AUTOGEN_SUBDIR_MODE="true" + shift + ;; +esac + ORIGDIR=`pwd` cd $srcdir PROJECT=Fontconfig diff --git a/src/fccache.c b/src/fccache.c index 6a3d8e8..ba6af72 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -454,7 +454,8 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat) PAGE_READONLY, 0, 0, NULL); if (hFileMap != NULL) { - cache = MapViewOfFile (hFileMap, FILE_MAP_READ, 0, 0, size); + cache = MapViewOfFile (hFileMap, FILE_MAP_READ, 0, 0, + fd_stat->st_size); CloseHandle (hFileMap); } } -- 2.39.2