[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.ac |    2 +-
 src/fcstat.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7d75653285a3cd67b5f066fe899821462d7f324f
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Feb 6 17:29:19 2014 +0900

    Add missing #include <sys/statvfs.h> in fcstat.c
    
    https://bugs.freedesktop.org/show_bug.cgi?id=74602

diff --git a/configure.ac b/configure.ac
index 89fe117..331bd32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,7 +138,7 @@ dnl ==========================================================================
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h regex.h stdlib.h string.h unistd.h sys/vfs.h sys/statfs.h sys/param.h sys/mount.h])
+AC_CHECK_HEADERS([fcntl.h regex.h stdlib.h string.h unistd.h sys/statvfs.h sys/vfs.h sys/statfs.h sys/param.h sys/mount.h])
 AX_CREATE_STDINT_H([src/fcstdint.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
diff --git a/src/fcstat.c b/src/fcstat.c
index ff8e884..f384767 100644
--- a/src/fcstat.c
+++ b/src/fcstat.c
@@ -30,6 +30,9 @@
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
 #ifdef HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #endif