X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=fontconfig%2Ffontconfig.h;h=15e8f7fffba0d8cece4fe9efc718d367d0a0ac5b;hb=c2c6976d1a88cc35143ffcc34f3c38d0a28d34f4;hp=312256f879e3321faae2c137f188bc6f4895a9f9;hpb=2304e38f9bc070ccd54f80187c208d93b6eeb373;p=fontconfig.git

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 312256f..15e8f7f 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -27,6 +27,12 @@
 
 #include <stdarg.h>
 
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#define FC_ATTRIBUTE_SENTINEL(x) __attribute__((__sentinel__(0)))
+#else
+#define FC_ATTRIBUTE_SENTINEL(x)
+#endif
+
 typedef unsigned char	FcChar8;
 typedef unsigned short	FcChar16;
 typedef unsigned int	FcChar32;
@@ -40,7 +46,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	3
-#define FC_REVISION	2
+#define FC_REVISION	95
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
@@ -96,7 +102,10 @@ typedef int		FcBool;
 #define FC_CAPABILITY       "capability"	/* String */
 #define FC_FONTFORMAT	    "fontformat"	/* String */
 #define FC_EMBOLDEN	    "embolden"		/* Bool - true if emboldening needed*/
+#define FC_EMBEDDED_BITMAP  "embeddedbitmap"	/* Bool - true to enable embedded bitmaps */
+#define FC_DECORATIVE	    "decorative"	/* Bool - true if style is a decorative variant */
 
+#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
 
@@ -200,24 +209,18 @@ typedef struct _FcPattern   FcPattern;
 
 typedef struct _FcLangSet   FcLangSet;
 
-#define FC_BANK_DYNAMIC 0
-#define FC_BANK_FIRST 1
-
 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;
 
@@ -234,7 +237,7 @@ typedef struct _FcObjectSet {
 } FcObjectSet;
     
 typedef enum _FcMatchKind {
-    FcMatchPattern, FcMatchFont
+    FcMatchPattern, FcMatchFont, FcMatchScan
 } FcMatchKind;
 
 typedef enum _FcLangResult {
@@ -528,7 +531,7 @@ FcObjectSet *
 FcObjectSetVaBuild (const char *first, va_list va);
 
 FcObjectSet *
-FcObjectSetBuild (const char *first, ...);
+FcObjectSetBuild (const char *first, ...) FC_ATTRIBUTE_SENTINEL(0);
 
 FcFontSet *
 FcFontSetList (FcConfig	    *config,
@@ -745,7 +748,7 @@ FcPattern *
 FcPatternVaBuild (FcPattern *orig, va_list va);
     
 FcPattern *
-FcPatternBuild (FcPattern *orig, ...);
+FcPatternBuild (FcPattern *orig, ...) FC_ATTRIBUTE_SENTINEL(0);
 
 /* fcstr.c */
 
@@ -847,4 +850,6 @@ FcConfigParseAndLoad (FcConfig *config, const FcChar8 *file, FcBool complain);
 
 _FCFUNCPROTOEND
 
+#undef FC_ATTRIBUTE_SENTINEL
+
 #endif /* _FONTCONFIG_H_ */