diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-10-14 13:56:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-10-14 13:56:06 +0100 |
| commit | 57c98ea9acdcef5021f5671efa6475a5794a51c4 (patch) | |
| tree | 4cb23c03c0eb6be23d365acf566750d6d1a70ab2 /include | |
| parent | 96292515c07e3a99f5a29540ed2f257b1ff75111 (diff) | |
| parent | 41d004d8af59885da2c21460a73898b1aa09690f (diff) | |
| download | qemu-57c98ea9acdcef5021f5671efa6475a5794a51c4.zip qemu-57c98ea9acdcef5021f5671efa6475a5794a51c4.tar.gz qemu-57c98ea9acdcef5021f5671efa6475a5794a51c4.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201014-pull-request' into staging
ui: fixes for sdl, curses, vnc, input-linux.
# gpg: Signature made Wed 14 Oct 2020 09:21:35 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20201014-pull-request:
ui: Fix default window_id value
input-linux: Reset il->fd handler before closing it
SDL: enable OpenGL context creation
vnc-stubs: Allow -vnc none
configure: Fixes ncursesw detection under msys2/mingw by convert them to meson
win32: Simplify gmtime_r detection not depends on if _POSIX_C_SOURCE are defined on msys2/mingw
curses: Fixes curses compiling errors.
curses: Fixes compiler error that complain don't have langinfo.h on msys2/mingw
qemu-edid: drop cast
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/os-win32.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index d8978e2..5346d51 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -48,12 +48,12 @@ #define siglongjmp(env, val) longjmp(env, val) /* Missing POSIX functions. Don't use MinGW-w64 macros. */ -#ifndef CONFIG_LOCALTIME_R +#ifndef _POSIX_THREAD_SAFE_FUNCTIONS #undef gmtime_r struct tm *gmtime_r(const time_t *timep, struct tm *result); #undef localtime_r struct tm *localtime_r(const time_t *timep, struct tm *result); -#endif /* CONFIG_LOCALTIME_R */ +#endif /* _POSIX_THREAD_SAFE_FUNCTIONS */ static inline void os_setup_signal_handling(void) {} static inline void os_daemonize(void) {} |