[Fontconfig] fontconfig: Branch 'master'

Akira TAGOH tagoh at kemper.freedesktop.org
Sun Oct 20 20:07:06 PDT 2013


 src/fccache.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 06b388523d747db16708c1662f3c6d64a36d5daf
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Oct 21 11:50:55 2013 +0900

    Fix build issue on Debian/kFreeBSD 7.0
    
    There are posix_fadvise(2) but not POSIX_FADV_WILLNEED.
    Patch from Ryo ONODERA.

diff --git a/src/fccache.c b/src/fccache.c
index 3568595..c7f2437 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -28,6 +28,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <assert.h>
 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
 #  include <unistd.h>
@@ -572,7 +573,7 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
     {
 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
 	cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0);
-#ifdef HAVE_POSIX_FADVISE
+#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED)
 	posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
 #endif
 	if (cache == MAP_FAILED)


More information about the Fontconfig mailing list