diff options
| author | Sven Gothel <[email protected]> | 2019-12-12 19:21:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-12 19:21:00 +0100 |
| commit | 4df06c6894b39af5bf4681c0acf0c1c080084c80 (patch) | |
| tree | 2505eb6e3b5798db34033c4cac2d4613bf6bda44 /common/win_main_utf8.h | |
| parent | 8915501ed02eac2b3bce9a7fc06cb1ab562901c3 (diff) | |
| parent | c0cf323e1d56ce605e90927324d2fdafcfbb564a (diff) | |
merge v1.20.0
Diffstat (limited to 'common/win_main_utf8.h')
| -rw-r--r-- | common/win_main_utf8.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/win_main_utf8.h b/common/win_main_utf8.h index faddc257..242d3b8a 100644 --- a/common/win_main_utf8.h +++ b/common/win_main_utf8.h @@ -30,7 +30,7 @@ static FILE *my_fopen(const char *fname, const char *mode) return NULL; } - wname = calloc(sizeof(WCHAR), namelen+modelen); + wname = (WCHAR*)calloc(sizeof(WCHAR), namelen+modelen); wmode = wname + namelen; MultiByteToWideChar(CP_UTF8, 0, fname, -1, wname, namelen); MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, modelen); @@ -73,7 +73,7 @@ static void GetUnicodeArgs(int *argc, char ***argv) total += WideCharToMultiByte(CP_UTF8, 0, args[i], -1, NULL, 0, NULL, NULL); atexit(cleanup_arglist); - arglist = *argv = calloc(1, total); + arglist = *argv = (char**)calloc(1, total); (*argv)[0] = (char*)(*argv + nargs); for(i = 0;i < nargs-1;i++) { |