aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-10 11:23:10 +0200
committermarha <marha@users.sourceforge.net>2012-05-10 11:23:10 +0200
commit13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (patch)
tree17a9a3e6a44353fd016b1d0725141bdfc47c4021 /fontconfig
parent8a448108ec0bc3a0a488b2234e0d12aee503c67c (diff)
downloadvcxsrv-13a63d4f69c0692539448cb3d8e4a0e1ffdf2183.tar.gz
vcxsrv-13a63d4f69c0692539448cb3d8e4a0e1ffdf2183.tar.bz2
vcxsrv-13a63d4f69c0692539448cb3d8e4a0e1ffdf2183.zip
xserver fontconfig mesa git update 10 May 2012
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/fonts.conf.in6
-rw-r--r--fontconfig/src/fcarch.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/fontconfig/fonts.conf.in b/fontconfig/fonts.conf.in
index 533381b9d..8f9fb8823 100644
--- a/fontconfig/fonts.conf.in
+++ b/fontconfig/fonts.conf.in
@@ -34,7 +34,7 @@
<test qual="any" name="family">
<string>mono</string>
</test>
- <edit name="family" mode="assign">
+ <edit name="family" mode="assign" binding="same">
<string>monospace</string>
</edit>
</match>
@@ -46,7 +46,7 @@
<test qual="any" name="family">
<string>sans serif</string>
</test>
- <edit name="family" mode="assign">
+ <edit name="family" mode="assign" binding="same">
<string>sans-serif</string>
</edit>
</match>
@@ -58,7 +58,7 @@
<test qual="any" name="family">
<string>sans</string>
</test>
- <edit name="family" mode="assign">
+ <edit name="family" mode="assign" binding="same">
<string>sans-serif</string>
</edit>
</match>
diff --git a/fontconfig/src/fcarch.c b/fontconfig/src/fcarch.c
index 5fe7d97d8..44548fc1b 100644
--- a/fontconfig/src/fcarch.c
+++ b/fontconfig/src/fcarch.c
@@ -56,8 +56,6 @@ FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcStrSet *));
FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcCharLeaf **));
FC_ASSERT_STATIC (SIZEOF_VOID_P == sizeof (FcChar16 *));
-#define FC_MAX(a,b) ((a) > (b) ? (a) : (b))
-
FC_ASSERT_STATIC (0x08 + 1*FC_MAX(4,ALIGNOF_DOUBLE) == sizeof (FcValue));
FC_ASSERT_STATIC (0x00 + 2*SIZEOF_VOID_P == sizeof (FcPatternElt));
FC_ASSERT_STATIC (0x08 + 2*SIZEOF_VOID_P == sizeof (FcPattern));