diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-05-02 18:35:56 +0400 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-05-07 21:00:43 +0400 |
| commit | f95c967a7950797109d2a96fcfa2e3a2899f2c99 (patch) | |
| tree | 05865cf811a1d7b2a97fac1d24e2d8aff8b7bc42 /include/qemu-common.h | |
| parent | f33cc84dd4af7776309d118412df008ec4108a57 (diff) | |
glib: move g_poll() replacement into glib-compat.h
We have a dedicated header file for wrappers to smooth over glib version
differences. Move the g_poll() definition into glib-compat.h for
consistency.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Cc: qemu-trivial@nongnu.org
Diffstat (limited to 'include/qemu-common.h')
| -rw-r--r-- | include/qemu-common.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/qemu-common.h b/include/qemu-common.h index a998e8d36c..3f3fd60f5b 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -124,18 +124,6 @@ int qemu_main(int argc, char **argv, char **envp); void qemu_get_timedate(struct tm *tm, int offset); int qemu_timedate_diff(struct tm *tm); -#if !GLIB_CHECK_VERSION(2, 20, 0) -/* - * Glib before 2.20.0 doesn't implement g_poll, so wrap it to compile properly - * on older systems. - */ -static inline gint g_poll(GPollFD *fds, guint nfds, gint timeout) -{ - GMainContext *ctx = g_main_context_default(); - return g_main_context_get_poll_func(ctx)(fds, nfds, timeout); -} -#endif - /** * is_help_option: * @s: string to test |