OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e93d8bc
)
oslib-win32: do not rely on macro to get redefined function name
author
Paolo Bonzini
<pbonzini@redhat.com>
Wed, 14 Apr 2021 14:09:26 +0000
(16:09 +0200)
committer
Paolo Bonzini
<pbonzini@redhat.com>
Tue, 4 May 2021 12:15:34 +0000
(14:15 +0200)
On Windows with glib <2.50, g_poll is redefined to use the variant
defined in util/oslib-win32.c. Use the same name in the declaration
and definition for ease of grepping.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
util/oslib-win32.c
patch
|
blob
|
history
diff --git
a/util/oslib-win32.c
b/util/oslib-win32.c
index
f68b801
..
13418f6
100644
(file)
--- a/
util/oslib-win32.c
+++ b/
util/oslib-win32.c
@@
-472,7
+472,7
@@
static int poll_rest(gboolean poll_msgs, HANDLE *handles, gint nhandles,
return 0;
}
-gint g_poll(GPollFD *fds, guint nfds, gint timeout)
+gint g_poll
_fixed
(GPollFD *fds, guint nfds, gint timeout)
{
HANDLE handles[MAXIMUM_WAIT_OBJECTS];
gboolean poll_msgs = FALSE;