aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src/fcstr.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-09 08:56:06 +0200
committermarha <marha@users.sourceforge.net>2012-10-09 08:56:06 +0200
commite957ce706e896f5ed802d81f26a2663578f8153f (patch)
tree862fdd3b107b8c1bea4b84d80e60ffb41c30217d /fontconfig/src/fcstr.c
parent6b15e563fb2212808ecff29bb72e0e941425b067 (diff)
parentc48e25635aaafefec0c7761d5310f7d2071fc50c (diff)
downloadvcxsrv-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/src/fcstr.c')
-rw-r--r--fontconfig/src/fcstr.c4
1 files changed, 4 insertions, 0 deletions
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')
{