diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-10 11:49:54 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-10 11:49:54 +0200 |
| commit | 6231dd66fec697922b164ec03731f04542c2b30e (patch) | |
| tree | 83bfa2dec8ba2d32860d513b7816dae412712fa5 /fontconfig | |
| parent | 58780b4306bd1254c6c0e65d255630d5c546005f (diff) | |
| parent | 13a63d4f69c0692539448cb3d8e4a0e1ffdf2183 (diff) | |
| download | vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.gz vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.tar.bz2 vcxsrv-6231dd66fec697922b164ec03731f04542c2b30e.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fonts.conf.in | 6 | ||||
| -rw-r--r-- | fontconfig/src/fcarch.c | 2 |
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)); |