From f95c967a7950797109d2a96fcfa2e3a2899f2c99 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Fri, 2 May 2014 18:35:56 +0400 Subject: 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 Signed-off-by: Michael Tokarev Cc: qemu-trivial@nongnu.org --- include/glib-compat.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/glib-compat.h') diff --git a/include/glib-compat.h b/include/glib-compat.h index 8aa77afd62..8d25900700 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -24,4 +24,16 @@ static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, } #endif +#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 + #endif -- cgit 1.4.1