diff options
| author | Peter Maydell | 2020-10-14 14:56:06 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-10-14 14:56:06 +0200 |
| commit | 57c98ea9acdcef5021f5671efa6475a5794a51c4 (patch) | |
| tree | 4cb23c03c0eb6be23d365acf566750d6d1a70ab2 /util/oslib-win32.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pul... (diff) | |
| parent | ui: Fix default window_id value (diff) | |
| download | qemu-57c98ea9acdcef5021f5671efa6475a5794a51c4.tar.gz qemu-57c98ea9acdcef5021f5671efa6475a5794a51c4.tar.xz qemu-57c98ea9acdcef5021f5671efa6475a5794a51c4.zip | |
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 'util/oslib-win32.c')
| -rw-r--r-- | util/oslib-win32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/oslib-win32.c b/util/oslib-win32.c index 051afb217b..e99debfb8d 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -106,7 +106,7 @@ void qemu_anon_ram_free(void *ptr, size_t size) } } -#ifndef CONFIG_LOCALTIME_R +#ifndef _POSIX_THREAD_SAFE_FUNCTIONS /* FIXME: add proper locking */ struct tm *gmtime_r(const time_t *timep, struct tm *result) { @@ -130,7 +130,7 @@ struct tm *localtime_r(const time_t *timep, struct tm *result) } return p; } -#endif /* CONFIG_LOCALTIME_R */ +#endif /* _POSIX_THREAD_SAFE_FUNCTIONS */ static int socket_error(void) { |