[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/10] oslib-win32: do not rely on macro to get redefined function
From: |
Paolo Bonzini |
Subject: |
[PULL 01/10] oslib-win32: do not rely on macro to get redefined function name |
Date: |
Sat, 1 May 2021 11:30:17 +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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index f68b8012bb..13418f68c0 100644
--- 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;
--
2.31.1
- [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator), Paolo Bonzini, 2021/05/01
- [PULL 02/10] Add NVMM accelerator: configure and build logic, Paolo Bonzini, 2021/05/01
- [PULL 06/10] ratelimit: protect with a mutex, Paolo Bonzini, 2021/05/01
- [PULL 10/10] gitlab-ci: use --meson=internal for CFI jobs, Paolo Bonzini, 2021/05/01
- [PULL 01/10] oslib-win32: do not rely on macro to get redefined function name,
Paolo Bonzini <=
- [PULL 07/10] slirp: add configure option to disable smbd, Paolo Bonzini, 2021/05/01
- [PULL 03/10] Add NVMM accelerator: x86 CPU support, Paolo Bonzini, 2021/05/01
- [PULL 08/10] configure: reindent meson invocation, Paolo Bonzini, 2021/05/01
- [PULL 05/10] Add NVMM Accelerator: add maintainers for NetBSD/NVMM, Paolo Bonzini, 2021/05/01
- [PULL 04/10] Add NVMM accelerator: acceleration enlightenments, Paolo Bonzini, 2021/05/01
- [PULL 09/10] configure: handle meson options that have changed type, Paolo Bonzini, 2021/05/01
- Re: [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator), Peter Maydell, 2021/05/01