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

diff --git a/autogen.sh b/autogen.sh
index d9bed63763cbba1d573d8a2327215650fe28358b..c3d11caad731a36fde184132d5e5f36615480090 100755 (executable)
--- 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 6a3d8e8704612e35825bddce3a1021aa7e4fdb69..ba6af72ea880f751f6968968f2b77f08e95dff65 100644 (file)
--- 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);
            }
        }