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/w32_common.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/w32_common.c')
-rw-r--r-- | video/out/w32_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/w32_common.c b/video/out/w32_common.c index e9b01d5401..02e7064b59 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -42,7 +42,7 @@ #include "misc/rendezvous.h" #include "talloc.h" -static const WCHAR classname[] = L"mpv"; +static const WCHAR classname[] = u"mpv"; static __thread struct vo_w32_state *w32_thread_context; @@ -1129,7 +1129,7 @@ static void *gui_thread(void *ptr) .style = CS_HREDRAW | CS_VREDRAW, .lpfnWndProc = WndProc, .hInstance = hInstance, - .hIcon = LoadIconW(hInstance, L"IDI_ICON1"), + .hIcon = LoadIconW(hInstance, u"IDI_ICON1"), .hCursor = LoadCursor(NULL, IDC_ARROW), .lpszClassName = classname, }; |