Fix build issues on MinGW

This commit is contained in:
Akira TAGOH 2019-03-25 16:17:33 +09:00
parent 9177cf2c38
commit b1bcc0cbb2
1 changed files with 3 additions and 3 deletions

View File

@ -1338,7 +1338,7 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
if (!GetModuleFileName (NULL, (LPCH) buffer, sizeof (buffer) - 20)) if (!GetModuleFileName (NULL, (LPCH) buffer, sizeof (buffer) - 20))
{ {
FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
goto bail; return NULL;
} }
/* /*
* Must use the multi-byte aware function to search * Must use the multi-byte aware function to search
@ -1357,7 +1357,7 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
if (!GetModuleFileName (NULL, (LPCH) buffer, sizeof (buffer) - 20)) if (!GetModuleFileName (NULL, (LPCH) buffer, sizeof (buffer) - 20))
{ {
FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed"); FcConfigMessage (parse, FcSevereError, "GetModuleFileName failed");
goto bail; return NULL;
} }
p = _mbsrchr (data, '\\'); p = _mbsrchr (data, '\\');
if (p) *p = '\0'; if (p) *p = '\0';
@ -1371,7 +1371,7 @@ _get_real_path_from_prefix(FcConfigParse *parse, const FcChar8 *path, const FcCh
if (rc == 0 || rc > sizeof (buffer) - 20) if (rc == 0 || rc > sizeof (buffer) - 20)
{ {
FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed"); FcConfigMessage (parse, FcSevereError, "GetSystemWindowsDirectory failed");
goto bail; return NULL;
} }
if (data [strlen ((const char *) data) - 1] != '\\') if (data [strlen ((const char *) data) - 1] != '\\')
strcat ((char *) data, "\\"); strcat ((char *) data, "\\");