Revert ABI changes from version 2.3

[fontconfig.git] / fontconfig / fontconfig.h

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index aae60f44c4973d0fc9befa667404d75606a11ee0..feb781ed8157708ffc9d5712a6606db74e534302 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -46,7 +46,7 @@ typedef int           FcBool;
 
 #define FC_MAJOR       2
 #define FC_MINOR       3
-#define FC_REVISION    92
+#define FC_REVISION    95
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -104,6 +104,7 @@ typedef int         FcBool;
 #define FC_EMBOLDEN        "embolden"          /* Bool - true if emboldening needed*/
 #define FC_EMBEDDED_BITMAP  "embeddedbitmap"   /* Bool - true to enable embedded bitmaps */
 
+#define FC_CACHE_SUFFIX                    ".cache-"FC_CACHE_VERSION
 #define FC_DIR_CACHE_FILE          "fonts.cache-"FC_CACHE_VERSION
 #define FC_USER_CACHE_FILE         ".fonts.cache-"FC_CACHE_VERSION
 
@@ -210,18 +211,15 @@ typedef struct _FcLangSet   FcLangSet;
 typedef struct _FcValue {
     FcType     type;
     union {
-       const FcChar8  *s;
-       int             s_off;
+       const FcChar8   *s;
        int             i;
        FcBool          b;
        double          d;
-       const FcMatrix  *m;
-       const FcCharSet *c;
-       int             c_off;
+       const FcMatrix  *m;
+       const FcCharSet *c;
        void            *f;
        const FcPattern *p;
-       const FcLangSet *l;
-       int             l_off; /* this is a difference of char *s */
+       const FcLangSet *l;
     } u;
 } FcValue;
 
@@ -277,12 +275,6 @@ _FCFUNCPROTOBEGIN
 FcBool
 FcDirCacheValid (const FcChar8 *cache_file);
 
-FcBool
-FcDirCacheHasCurrentArch (const FcChar8 *dir);
-
-FcBool
-FcDirCacheUnlink (const FcChar8 *dir);
-
 /* fcblanks.c */
 FcBlanks *
 FcBlanksCreate (void);
@@ -663,9 +655,6 @@ FcNameParse (const FcChar8 *name);
 FcChar8 *
 FcNameUnparse (FcPattern *pat);
 
-FcChar8 *
-FcNameUnparseEscaped (FcPattern *pat, FcBool escape);
-
 /* fcpat.c */
 FcPattern *
 FcPatternCreate (void);