[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

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

New commits:
commit a44cc450b5f3d67c0298a912e12ed5ff234490f9
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Oct 13 13:04:18 2015 +0900

    Use long long to see the same size between LP64 and LLP64

diff --git a/src/fccache.c b/src/fccache.c
index 20c4418..b27dcfe 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -573,7 +573,7 @@ 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.%ld dir checksum %d.%ld\n",
+	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);
 #else
     if (FcDebug () & FC_DBG_CACHE)
diff --git a/src/fcint.h b/src/fcint.h
index 68f9817..c6958d0 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	checksum_nano;	    /* checksum of directory state */
+    long long	checksum_nano;	    /* checksum of directory state */
 };
 
 #undef FcCacheDir