From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAJd8-000169-JT for qemu-devel@nongnu.org; Mon, 03 Feb 2014 08:32:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAJd2-0004X4-K3 for qemu-devel@nongnu.org; Mon, 03 Feb 2014 08:32:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAJd2-0004Wy-AL for qemu-devel@nongnu.org; Mon, 03 Feb 2014 08:32:00 -0500 From: Stefan Hajnoczi Date: Mon, 3 Feb 2014 14:31:48 +0100 Message-Id: <1391434310-9990-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1391434310-9990-1-git-send-email-stefanha@redhat.com> References: <1391434310-9990-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/3] glib: move g_poll() replacement into glib-compat.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori 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 --- include/glib-compat.h | 12 ++++++++++++ include/qemu-common.h | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/glib-compat.h b/include/glib-compat.h index 8aa77af..8d25900 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 diff --git a/include/qemu-common.h b/include/qemu-common.h index 5054836..e0e03cc 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 -- 1.8.5.3