diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-09 08:56:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-09 08:56:06 +0200 |
| commit | e957ce706e896f5ed802d81f26a2663578f8153f (patch) | |
| tree | 862fdd3b107b8c1bea4b84d80e60ffb41c30217d /fontconfig | |
| parent | 6b15e563fb2212808ecff29bb72e0e941425b067 (diff) | |
| parent | c48e25635aaafefec0c7761d5310f7d2071fc50c (diff) | |
| download | vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.gz vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.tar.bz2 vcxsrv-e957ce706e896f5ed802d81f26a2663578f8153f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/fonts.dtd | 10 | ||||
| -rw-r--r-- | fontconfig/src/fcstr.c | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd index 782e59244..4a309a9d2 100644 --- a/fontconfig/fonts.dtd +++ b/fontconfig/fonts.dtd @@ -13,7 +13,7 @@ --> <!ELEMENT dir (#PCDATA)> <!ATTLIST dir - prefix (#PCDATA) "default" + prefix CDATA "default" xml:space (default|preserve) 'preserve'> <!-- @@ -36,7 +36,7 @@ --> <!ELEMENT cachedir (#PCDATA)> <!ATTLIST cachedir - prefix (#PCDATA) "default" + prefix CDATA "default" xml:space (default|preserve) 'preserve'> <!-- @@ -52,8 +52,8 @@ <!ELEMENT include (#PCDATA)> <!ATTLIST include ignore_missing (no|yes) "no" - prefix (#PCDATA) "default" - deprecated (#PCDATA) "no" + prefix CDATA "default" + deprecated (yes|no) "no" xml:space (default|preserve) "preserve"> <!-- @@ -165,7 +165,7 @@ qual (any|all|first|not_first) "any" name CDATA #REQUIRED target (pattern|font|default) "default" - ignore-blanks (#PCDATA) "false" + ignore-blanks (true|false) "false" compare (eq|not_eq|less|less_eq|more|more_eq|contains|not_contains) "eq"> <!-- diff --git a/fontconfig/src/fcstr.c b/fontconfig/src/fcstr.c index f505ea665..037960d2f 100644 --- a/fontconfig/src/fcstr.c +++ b/fontconfig/src/fcstr.c @@ -974,6 +974,10 @@ FcStrCanonAbsoluteFilename (const FcChar8 *s) FcMemAlloc (FC_MEM_STRING, size); slash = NULL; f = file; +#ifdef _WIN32 + if (*s == '/' && *(s+1) == '/') /* Network path, do not squash // */ + *f++ = *s++; +#endif for (;;) { if (*s == '/' || *s == '\0') { |