diff options
author | wm4 <wm4@nowhere> | 2015-07-30 21:50:11 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-07-30 21:50:11 +0200 |
commit | fefac2c941149fb49bcb5126060be74494d0c287 (patch) | |
tree | 9835f45627a3c3bbb18f8e037ed0ff5ea24606a8 /video/out/gl_w32.c | |
parent | c8fab7cc7b98af8da0bf734dbdb1a3efc5db977e (diff) | |
download | mpv-fefac2c941149fb49bcb5126060be74494d0c287.tar.bz2 mpv-fefac2c941149fb49bcb5126060be74494d0c287.tar.xz |
win32: more wchar_t -> WCHAR replacements
This was essentially missing from commit 0b52ac8a.
Since L"..." string literals have the type wchar_t[], we can't use them
for UTF-16 strings. Use C11 u"..." string literals instead. These have
the type char16_t[], but we simply assume char16_t is the same
underlying type as WCHAR. In practice, they're both unsigned short.
For this reason use -std=c11 on Windows. Since Windows is a "special"
environment (we require either MinGW or Cygwin), we don't need to worry
too much about compiler compatibility.
Diffstat (limited to 'video/out/gl_w32.c')
-rw-r--r-- | video/out/gl_w32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/gl_w32.c b/video/out/gl_w32.c index 87f98f117e..68df3397c1 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 = GetModuleHandle(L"opengl32.dll"); + oglmod = GetModuleHandleW(u"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 = LoadLibrary(L"Dwmapi.dll"); + w32_ctx->dwmapi_dll = LoadLibraryW(u"Dwmapi.dll"); if (w32_ctx->dwmapi_dll) w32_ctx->dwmflush = (DwmFlush_t)GetProcAddress(w32_ctx->dwmapi_dll, "DwmFlush"); |