diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-11-20 18:15:08 +0100 |
| commit | 8700700de8a4103724796077034f7f254ad974bc (patch) | |
| tree | 2fce4dee518a202c45c3f16567db36edc92ed914 /osdep | |
| parent | e6b85c91700bee0ddc92e98a30d5021691bd6f65 (diff) | |
| parent | eafc273d2c2ae6d247d741202e58ca23dc938cb2 (diff) | |
| download | mpv-8700700de8a4103724796077034f7f254ad974bc.tar.bz2 mpv-8700700de8a4103724796077034f7f254ad974bc.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/compiler.h | 2 | ||||
| -rw-r--r-- | osdep/win32-console-wrapper.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/osdep/compiler.h b/osdep/compiler.h index a507cd02c2..0edea7de4a 100644 --- a/osdep/compiler.h +++ b/osdep/compiler.h @@ -10,7 +10,7 @@ /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first * argument. **/ -#ifdef __MINGW32__ +#if defined(__MINGW32__) && !defined(__clang__) // MinGW maps "printf" to the non-standard MSVCRT functions, even if // __USE_MINGW_ANSI_STDIO is defined and set to 1. We need to use "gnu_printf", // which isn't necessarily available on other GCC compatible compilers. diff --git a/osdep/win32-console-wrapper.c b/osdep/win32-console-wrapper.c index 778d699161..ff69f9aee1 100644 --- a/osdep/win32-console-wrapper.c +++ b/osdep/win32-console-wrapper.c @@ -36,8 +36,8 @@ void cr_perror(const wchar_t *prefix) int cr_runproc(wchar_t *name, wchar_t *cmdline) { - STARTUPINFO si; - STARTUPINFO our_si; + STARTUPINFOW si; + STARTUPINFOW our_si; PROCESS_INFORMATION pi; DWORD retval = 1; @@ -50,7 +50,7 @@ int cr_runproc(wchar_t *name, wchar_t *cmdline) // Copy the list of inherited CRT file descriptors to the new process our_si.cb = sizeof(our_si); - GetStartupInfo(&our_si); + GetStartupInfoW(&our_si); si.lpReserved2 = our_si.lpReserved2; si.cbReserved2 = our_si.cbReserved2; |