From 0b52ac8a78245793daaf533f5f8b74cb019a8aa8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 28 Jul 2015 23:59:17 +0200 Subject: win32: replace wchar_t with WCHAR WCHAR is more portable. While at least MinGW, Cygwin, and MSVC actually use 16 bit wchar_t, Midipix will have 32 bit wchar_t. In that context, using WCHAR instead is more portable. This affects only non-MinGW parts, so not all uses of wchar_t need to be changed. For example, terminal-win.c won't be used on Midipix at all. (Most of io.c won't either, so the search & replace here is more than necessary, but also not harmful.) (Midipix is not useable yet, so this is just preparation.) --- osdep/path-win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'osdep/path-win.c') diff --git a/osdep/path-win.c b/osdep/path-win.c index a735fad069..79dffc77a2 100644 --- a/osdep/path-win.c +++ b/osdep/path-win.c @@ -31,7 +31,7 @@ static char *portable_path; static char *mp_get_win_exe_dir(void *talloc_ctx) { - wchar_t w_exedir[MAX_PATH + 1] = {0}; + WCHAR w_exedir[MAX_PATH + 1] = {0}; int len = (int)GetModuleFileNameW(NULL, w_exedir, MAX_PATH); int imax = 0; @@ -54,7 +54,7 @@ static char *mp_get_win_exe_subdir(void *ta_ctx, const char *name) static char *mp_get_win_shell_dir(void *talloc_ctx, int folder) { - wchar_t w_appdir[MAX_PATH + 1] = {0}; + WCHAR w_appdir[MAX_PATH + 1] = {0}; if (SHGetFolderPathW(NULL, folder|CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, w_appdir) != S_OK) -- cgit v1.2.3