Imported Upstream version 2.12.1

[platform/upstream/fontconfig.git] / fontconfig / fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index b14c961..5c72b22 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -51,8 +51,8 @@ typedef int           FcBool;
  */
 
 #define FC_MAJOR       2
-#define FC_MINOR       11
-#define FC_REVISION    93
+#define FC_MINOR       12
+#define FC_REVISION    1
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -66,7 +66,10 @@ typedef int          FcBool;
  * it means multiple copies of the font information.
  */
 
-#define FC_CACHE_VERSION    "5"
+#define FC_CACHE_VERSION_NUMBER        7
+#define _FC_STRINGIFY_(s)      #s
+#define _FC_STRINGIFY(s)       _FC_STRINGIFY_(s)
+#define FC_CACHE_VERSION       _FC_STRINGIFY(FC_CACHE_VERSION_NUMBER)
 
 #define FcTrue         1
 #define FcFalse                0
@@ -95,7 +98,8 @@ typedef int           FcBool;
 #define FC_OUTLINE         "outline"           /* Bool */
 #define FC_SCALABLE        "scalable"          /* Bool */
 #define FC_COLOR           "color"             /* Bool */
-#define FC_SCALE           "scale"             /* double */
+#define FC_SCALE           "scale"             /* double (deprecated) */
+#define FC_SYMBOL          "symbol"            /* Bool */
 #define FC_DPI             "dpi"               /* double */
 #define FC_RGBA                    "rgba"              /* Int */
 #define FC_MINSPACE        "minspace"          /* Bool use minimum line spacing */
@@ -216,7 +220,7 @@ typedef struct _FcMatrix {
 typedef struct _FcCharSet FcCharSet;
 
 typedef struct _FcObjectType {
-    const char *object;
+    char       *object;
     FcType     type;
 } FcObjectType;