walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix building for WIN32 

8c255fb185 moved some code out of switch
but did not declare 'buffer'. Also, replacing the "break" with
"goto bail" neglected the WIN32 specific code.
This commit is contained in:
Mark Brand 2012-06-11 20:13:02 +09:00 committed by Akira TAGOH
parent 101825a129
commit 0b20bd0281
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fcxml.c
View File

@ -1850,6 +1850,9 @@ FcParseDir (FcConfigParse *parse)
{ {
const FcChar8 *attr, *data; const FcChar8 *attr, *data;
FcChar8 *prefix = NULL; FcChar8 *prefix = NULL;
#ifdef _WIN32
FcChar8 buffer[1000];
#endif
attr = FcConfigGetAttribute (parse, "prefix"); attr = FcConfigGetAttribute (parse, "prefix");
if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0) if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
@ -1886,7 +1889,7 @@ FcParseDir (FcConfigParse *parse)
if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20)) if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
{ {
FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
break; goto bail;
} }
/* /*
* Must use the multi-byte aware function to search * Must use the multi-byte aware function to search
@ -1905,7 +1908,7 @@ FcParseDir (FcConfigParse *parse)
if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20)) if (!GetModuleFileName (NULL, buffer, sizeof (buffer) - 20))
{ {
FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
break; goto bail;
} }
p = _mbsrchr (data, '\\'); p = _mbsrchr (data, '\\');
if (p) *p = '\0'; if (p) *p = '\0';
@ -1919,7 +1922,7 @@ FcParseDir (FcConfigParse *parse)
if (rc == 0 || rc > sizeof (buffer) - 20) if (rc == 0 || rc > sizeof (buffer) - 20)
{ {
FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed"); FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed");
break; goto bail;
} }
if (data [strlen (data) - 1] != '\\') if (data [strlen (data) - 1] != '\\')
strcat (data, "\\"); strcat (data, "\\");
@ -2510,9 +2513,6 @@ FcEndElement(void *userData, const XML_Char *name)
{ {
FcConfigParse *parse = userData; FcConfigParse *parse = userData;
FcChar8 *data; FcChar8 *data;
#ifdef _WIN32
FcChar8 buffer[1000];
#endif
if (!parse->pstack) if (!parse->pstack)
return; return;