aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-25 15:31:33 +0200
committermarha <marha@users.sourceforge.net>2012-05-25 15:31:33 +0200
commitaebbd673a0fb4d5e9ae4e8e690b29fb364376875 (patch)
treea9a711a27cf3c9081c75894781e983bccdc5fd99 /fontconfig
parentd4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c (diff)
downloadvcxsrv-aebbd673a0fb4d5e9ae4e8e690b29fb364376875.tar.gz
vcxsrv-aebbd673a0fb4d5e9ae4e8e690b29fb364376875.tar.bz2
vcxsrv-aebbd673a0fb4d5e9ae4e8e690b29fb364376875.zip
Solved compilation errors
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/src/fcxml.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c
index f0272705d..99f27a300 100644
--- a/fontconfig/src/fcxml.c
+++ b/fontconfig/src/fcxml.c
@@ -1846,6 +1846,9 @@ FcParseUnary (FcConfigParse *parse, FcOp op)
static void
FcParseDir (FcConfigParse *parse)
{
+#ifdef _WIN32
+ FcChar8 buffer[MAX_PATH];
+#endif
const FcChar8 *attr, *data;
FcChar8 *prefix = NULL;
@@ -1882,7 +1885,7 @@ FcParseDir (FcConfigParse *parse)
if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
{
FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
- break;
+ goto bail;
}
/*
* Must use the multi-byte aware function to search
@@ -1901,7 +1904,7 @@ FcParseDir (FcConfigParse *parse)
if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
{
FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
- break;
+ goto bail;
}
p = _mbsrchr (data, '\\');
if (p) *p = '\0';
@@ -1915,7 +1918,7 @@ FcParseDir (FcConfigParse *parse)
if (rc == 0 || rc > sizeof (buffer) - 20)
{
FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed");
- break;
+ goto bail;
}
if (data [strlen (data) - 1] != '\\')
strcat (data, "\\");