[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fccache.c |    4 ++--
 src/fcint.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bd96984e4b1da2e4b422050b773f3ded978d976c
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Oct 15 15:48:23 2015 +0900

    Use int64_t instead of long long

diff --git a/src/fccache.c b/src/fccache.c
index b067ada..f2b09cb 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -576,8 +576,8 @@ FcCacheTimeValid (FcConfig *config, FcCache *cache, struct stat *dir_stat)
 #ifdef HAVE_STRUCT_STAT_ST_MTIM
     fnano = (cache->checksum_nano == dir_stat->st_mtim.tv_nsec);
     if (FcDebug () & FC_DBG_CACHE)
-	printf ("FcCacheTimeValid dir \"%s\" cache checksum %d.%lld dir checksum %d.%ld\n",
-		FcCacheDir (cache), cache->checksum, cache->checksum_nano, (int) dir_stat->st_mtime, dir_stat->st_mtim.tv_nsec);
+	printf ("FcCacheTimeValid dir \"%s\" cache checksum %d.%ld dir checksum %d.%ld\n",
+		FcCacheDir (cache), cache->checksum, (long)cache->checksum_nano, (int) dir_stat->st_mtime, dir_stat->st_mtim.tv_nsec);
 #else
     if (FcDebug () & FC_DBG_CACHE)
 	printf ("FcCacheTimeValid dir \"%s\" cache checksum %d dir checksum %d\n",
diff --git a/src/fcint.h b/src/fcint.h
index c6958d0..8fa01d6 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -369,7 +369,7 @@ struct _FcCache {
     int		dirs_count;	    /* number of subdir strings */
     intptr_t	set;		    /* offset to font set */
     int		checksum;	    /* checksum of directory state */
-    long long	checksum_nano;	    /* checksum of directory state */
+    int64_t	checksum_nano;	    /* checksum of directory state */
 };
 
 #undef FcCacheDir