[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

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

New commits:
commit 365809938e901e603d2fe93363545e1c1afc1816
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Dec 25 13:11:21 2014 +0900

    Bump the cache version to 5
    
    FcPattern isn't compatible to the older.

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 85cdd6d..c571e28 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -66,7 +66,7 @@ typedef int		FcBool;
  * it means multiple copies of the font information.
  */
 
-#define FC_CACHE_VERSION    "4"
+#define FC_CACHE_VERSION    "5"
 
 #define FcTrue		1
 #define FcFalse		0
diff --git a/src/fcint.h b/src/fcint.h
index 45dfc6e..80205c9 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -470,7 +470,7 @@ typedef struct _FcCaseFold {
 
 #define FC_CACHE_MAGIC_MMAP	    0xFC02FC04
 #define FC_CACHE_MAGIC_ALLOC	    0xFC02FC05
-#define FC_CACHE_CONTENT_VERSION    4
+#define FC_CACHE_CONTENT_VERSION    5
 
 struct _FcAtomic {
     FcChar8	*file;		/* original file name */