aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-17 08:15:58 +0200
committermarha <marha@users.sourceforge.net>2012-04-17 08:15:58 +0200
commitc1194ccd395fdbb23c9ab56bc340ee20a5feeb82 (patch)
treebd62f97d832e6d17fab91db957c79bd38e6900bf /fontconfig
parentd6d3999ccb2cb72d55820770260172eccbbb68d7 (diff)
downloadvcxsrv-c1194ccd395fdbb23c9ab56bc340ee20a5feeb82.tar.gz
vcxsrv-c1194ccd395fdbb23c9ab56bc340ee20a5feeb82.tar.bz2
vcxsrv-c1194ccd395fdbb23c9ab56bc340ee20a5feeb82.zip
fontconfig mesa git update 17 Apr 2012
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/configure.in2
-rw-r--r--fontconfig/doc/fcconfig.fncs4
-rw-r--r--fontconfig/src/fccache.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/fontconfig/configure.in b/fontconfig/configure.in
index 1af236719..9c9de30e7 100644
--- a/fontconfig/configure.in
+++ b/fontconfig/configure.in
@@ -133,7 +133,7 @@ AC_TYPE_PID_T
# Checks for library functions.
AC_FUNC_VPRINTF
AC_FUNC_MMAP
-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree])
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree posix_fadvise])
#
# regex
diff --git a/fontconfig/doc/fcconfig.fncs b/fontconfig/doc/fcconfig.fncs
index fb55adece..9b9f66e1f 100644
--- a/fontconfig/doc/fcconfig.fncs
+++ b/fontconfig/doc/fcconfig.fncs
@@ -350,11 +350,11 @@ references into filename form.
</para><para>
A null or empty <parameter>name</parameter> indicates that the default configuration file should
be used; which file this references can be overridden with the
-FC_CONFIG_FILE environment variable. Next, if the name starts with <parameter>~</parameter>, it
+FONTCONFIG_FILE environment variable. Next, if the name starts with <parameter>~</parameter>, it
refers to a file in the current users home directory. Otherwise if the name
doesn't start with '/', it refers to a file in the default configuration
directory; the built-in default directory can be overridden with the
-FC_CONFIG_DIR environment variable.
+FONTCONFIG_PATH environment variable.
@@
@RET@ FcBool
diff --git a/fontconfig/src/fccache.c b/fontconfig/src/fccache.c
index db7561f9e..343ece9a7 100644
--- a/fontconfig/src/fccache.c
+++ b/fontconfig/src/fccache.c
@@ -609,6 +609,9 @@ 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
+ posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED);
+#endif
if (cache == MAP_FAILED)
cache = NULL;
#elif defined(_WIN32)