diff options
author | wm4 <wm4@nowhere> | 2015-08-01 20:51:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-08-01 21:09:11 +0200 |
commit | 41101c2996262c47757bc3bbf39cc11bd7dc5f99 (patch) | |
tree | 2add0f03bfd0a318880b9de5888f2ff264ad82d6 /osdep/io.h | |
parent | fefac2c941149fb49bcb5126060be74494d0c287 (diff) | |
download | mpv-41101c2996262c47757bc3bbf39cc11bd7dc5f99.tar.bz2 mpv-41101c2996262c47757bc3bbf39cc11bd7dc5f99.tar.xz |
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).
Diffstat (limited to 'osdep/io.h')
-rw-r--r-- | osdep/io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/osdep/io.h b/osdep/io.h index 3bf09fffb8..8d3e24f551 100644 --- a/osdep/io.h +++ b/osdep/io.h @@ -49,9 +49,9 @@ int mp_make_cloexec_pipe(int pipes[2]); int mp_make_wakeup_pipe(int pipes[2]); #ifdef _WIN32 -#include <windows.h> -WCHAR *mp_from_utf8(void *talloc_ctx, const char *s); -char *mp_to_utf8(void *talloc_ctx, const WCHAR *s); +#include <wchar.h> +wchar_t *mp_from_utf8(void *talloc_ctx, const char *s); +char *mp_to_utf8(void *talloc_ctx, const wchar_t *s); #endif #ifdef __CYGWIN__ |