From 41101c2996262c47757bc3bbf39cc11bd7dc5f99 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 1 Aug 2015 20:51:52 +0200 Subject: win32: revert wchar_t changes Revert "win32: more wchar_t -> WCHAR replacements" Revert "win32: replace wchar_t with WCHAR" Doing a "partial" port of this makes no sense anymore from my perspective. Revert the changes, as they're confusing without context, maintenance, and progress. These changes were a bit premature anyway, and might actually cause other issues (locale neutrality etc. as it was pointed out). --- 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 79dffc77a2..a735fad069 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 w_exedir[MAX_PATH + 1] = {0}; + wchar_t 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 w_appdir[MAX_PATH + 1] = {0}; + wchar_t 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