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). --- video/out/gl_w32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/out/gl_w32.c') diff --git a/video/out/gl_w32.c b/video/out/gl_w32.c index 68df3397c1..87f98f117e 100644 --- a/video/out/gl_w32.c +++ b/video/out/gl_w32.c @@ -84,7 +84,7 @@ static void *w32gpa(const GLubyte *procName) void *res = wglGetProcAddress(procName); if (res) return res; - oglmod = GetModuleHandleW(u"opengl32.dll"); + oglmod = GetModuleHandle(L"opengl32.dll"); return GetProcAddress(oglmod, procName); } @@ -208,7 +208,7 @@ static void create_ctx(void *ptr) if (!w32_ctx->context) create_context_w32_old(ctx); - w32_ctx->dwmapi_dll = LoadLibraryW(u"Dwmapi.dll"); + w32_ctx->dwmapi_dll = LoadLibrary(L"Dwmapi.dll"); if (w32_ctx->dwmapi_dll) w32_ctx->dwmflush = (DwmFlush_t)GetProcAddress(w32_ctx->dwmapi_dll, "DwmFlush"); -- cgit v1.2.3