From 956c20498738c242726b5a42ed28db8572a90bed Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 7 Feb 2013 10:17:56 +0100
Subject: mesa fontconfig git update 7 Feb 2013

fontconfig       commit 96220a5ed9d1d761b14a7ac516ac6786c132f280
mesa             commit 9ba1e23647c09290c98cc7133fb73dd1df1da8ab
---
 fontconfig/src/fcobjs.h | 90 ++++++++++++++++++++++++-------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'fontconfig/src/fcobjs.h')

diff --git a/fontconfig/src/fcobjs.h b/fontconfig/src/fcobjs.h
index 3cb2349d0..4c1138ae4 100644
--- a/fontconfig/src/fcobjs.h
+++ b/fontconfig/src/fcobjs.h
@@ -1,47 +1,47 @@
 /* DON'T REORDER!  The order is part of the cache signature. */
-FC_OBJECT (FAMILY,		FcTypeString)
-FC_OBJECT (FAMILYLANG,		FcTypeString)
-FC_OBJECT (STYLE,		FcTypeString)
-FC_OBJECT (STYLELANG,		FcTypeString)
-FC_OBJECT (FULLNAME,		FcTypeString)
-FC_OBJECT (FULLNAMELANG,	FcTypeString)
-FC_OBJECT (SLANT,		FcTypeInteger)
-FC_OBJECT (WEIGHT,		FcTypeInteger)
-FC_OBJECT (WIDTH,		FcTypeInteger)
-FC_OBJECT (SIZE,		FcTypeDouble)
-FC_OBJECT (ASPECT,		FcTypeDouble)
-FC_OBJECT (PIXEL_SIZE,		FcTypeDouble)
-FC_OBJECT (SPACING,		FcTypeInteger)
-FC_OBJECT (FOUNDRY,		FcTypeString)
-FC_OBJECT (ANTIALIAS,		FcTypeBool)
-FC_OBJECT (HINT_STYLE,		FcTypeInteger)
-FC_OBJECT (HINTING,		FcTypeBool)
-FC_OBJECT (VERTICAL_LAYOUT,	FcTypeBool)
-FC_OBJECT (AUTOHINT,		FcTypeBool)
-FC_OBJECT (GLOBAL_ADVANCE,	FcTypeBool)	/* deprecated */
-FC_OBJECT (FILE,		FcTypeString)
-FC_OBJECT (INDEX,		FcTypeInteger)
-FC_OBJECT (RASTERIZER,		FcTypeString)
-FC_OBJECT (OUTLINE,		FcTypeBool)
-FC_OBJECT (SCALABLE,		FcTypeBool)
-FC_OBJECT (DPI,			FcTypeDouble)
-FC_OBJECT (RGBA,		FcTypeInteger)
-FC_OBJECT (SCALE,		FcTypeDouble)
-FC_OBJECT (MINSPACE,		FcTypeBool)
-FC_OBJECT (CHAR_WIDTH,		FcTypeInteger)
-FC_OBJECT (CHAR_HEIGHT,		FcTypeInteger)
-FC_OBJECT (MATRIX,		FcTypeMatrix)
-FC_OBJECT (CHARSET,		FcTypeCharSet)
-FC_OBJECT (LANG,		FcTypeLangSet)
-FC_OBJECT (FONTVERSION,		FcTypeInteger)
-FC_OBJECT (CAPABILITY,		FcTypeString)
-FC_OBJECT (FONTFORMAT,		FcTypeString)
-FC_OBJECT (EMBOLDEN,		FcTypeBool)
-FC_OBJECT (EMBEDDED_BITMAP,	FcTypeBool)
-FC_OBJECT (DECORATIVE,		FcTypeBool)
-FC_OBJECT (LCD_FILTER,		FcTypeInteger)
-FC_OBJECT (NAMELANG,		FcTypeString)
-FC_OBJECT (FONT_FEATURES,	FcTypeString)
-FC_OBJECT (PRGNAME,		FcTypeString)
-FC_OBJECT (HASH,		FcTypeString)
+FC_OBJECT (FAMILY,		FcTypeString,	FcCompareFamily)
+FC_OBJECT (FAMILYLANG,		FcTypeString,	NULL)
+FC_OBJECT (STYLE,		FcTypeString,	FcCompareString)
+FC_OBJECT (STYLELANG,		FcTypeString,	NULL)
+FC_OBJECT (FULLNAME,		FcTypeString,	NULL)
+FC_OBJECT (FULLNAMELANG,	FcTypeString,	NULL)
+FC_OBJECT (SLANT,		FcTypeInteger,	FcCompareNumber)
+FC_OBJECT (WEIGHT,		FcTypeInteger,	FcCompareNumber)
+FC_OBJECT (WIDTH,		FcTypeInteger,	FcCompareNumber)
+FC_OBJECT (SIZE,		FcTypeDouble,	NULL)
+FC_OBJECT (ASPECT,		FcTypeDouble,	NULL)
+FC_OBJECT (PIXEL_SIZE,		FcTypeDouble,	FcCompareSize)
+FC_OBJECT (SPACING,		FcTypeInteger,	FcCompareNumber)
+FC_OBJECT (FOUNDRY,		FcTypeString,	FcCompareString)
+FC_OBJECT (ANTIALIAS,		FcTypeBool,	FcCompareBool)
+FC_OBJECT (HINT_STYLE,		FcTypeInteger,	NULL)
+FC_OBJECT (HINTING,		FcTypeBool,	NULL)
+FC_OBJECT (VERTICAL_LAYOUT,	FcTypeBool,	NULL)
+FC_OBJECT (AUTOHINT,		FcTypeBool,	NULL)
+FC_OBJECT (GLOBAL_ADVANCE,	FcTypeBool,	NULL)	/* deprecated */
+FC_OBJECT (FILE,		FcTypeString,	FcCompareFilename)
+FC_OBJECT (INDEX,		FcTypeInteger,	NULL)
+FC_OBJECT (RASTERIZER,		FcTypeString,	FcCompareString)
+FC_OBJECT (OUTLINE,		FcTypeBool,	FcCompareBool)
+FC_OBJECT (SCALABLE,		FcTypeBool,	NULL)
+FC_OBJECT (DPI,			FcTypeDouble,	NULL)
+FC_OBJECT (RGBA,		FcTypeInteger,	NULL)
+FC_OBJECT (SCALE,		FcTypeDouble,	NULL)
+FC_OBJECT (MINSPACE,		FcTypeBool,	NULL)
+FC_OBJECT (CHAR_WIDTH,		FcTypeInteger,	NULL)
+FC_OBJECT (CHAR_HEIGHT,		FcTypeInteger,	NULL)
+FC_OBJECT (MATRIX,		FcTypeMatrix,	NULL)
+FC_OBJECT (CHARSET,		FcTypeCharSet,	FcCompareCharSet)
+FC_OBJECT (LANG,		FcTypeLangSet,	FcCompareLang)
+FC_OBJECT (FONTVERSION,		FcTypeInteger,	FcCompareNumber)
+FC_OBJECT (CAPABILITY,		FcTypeString,	NULL)
+FC_OBJECT (FONTFORMAT,		FcTypeString,	NULL)
+FC_OBJECT (EMBOLDEN,		FcTypeBool,	NULL)
+FC_OBJECT (EMBEDDED_BITMAP,	FcTypeBool,	NULL)
+FC_OBJECT (DECORATIVE,		FcTypeBool,	FcCompareBool)
+FC_OBJECT (LCD_FILTER,		FcTypeInteger,	NULL)
+FC_OBJECT (NAMELANG,		FcTypeString,	NULL)
+FC_OBJECT (FONT_FEATURES,	FcTypeString,	NULL)
+FC_OBJECT (PRGNAME,		FcTypeString,	NULL)
+FC_OBJECT (HASH,		FcTypeString,	FcCompareString)
 /* ^-------------- Add new objects here. */
-- 
cgit v1.2.3