[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 16/22] glib: move g_poll() replacement into glib-co
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 16/22] glib: move g_poll() replacement into glib-compat.h |
Date: |
Mon, 5 May 2014 22:01:57 +0400 |
From: Stefan Hajnoczi <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
Cc: address@hidden
---
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 a998e8d..3f3fd60 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.7.10.4
- [Qemu-trivial] [PULL 04/22] tests/tcg: Fix compilation of test_path, (continued)
- [Qemu-trivial] [PULL 04/22] tests/tcg: Fix compilation of test_path, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 02/22] configure: remove bashism, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 05/22] arch_init: Be sure of only one exit entry with DPRINTF() for ram_load(), Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 22/22] libcacard: remove unnecessary EOL from debug prints, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 07/22] hw/mips: Add missing 'static' and 'const' attributes, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 11/22] qemu-timer: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 06/22] hw/9pfs: Add missing 'static' attributes, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 18/22] qmp: report path ambiguity error, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 21/22] docs/memory.txt: Fix document on MMIO operations, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 14/22] hw/9pfs: Add include file for exported symbol, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 16/22] glib: move g_poll() replacement into glib-compat.h,
Michael Tokarev <=
- [Qemu-trivial] [PULL 10/22] ui: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 09/22] monitor: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 20/22] readline: Sort completions before printing them., Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 17/22] libcacard: replace pstrcpy() with memcpy(), Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 13/22] xen: remove unused global, xen_xcg, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 19/22] readline: use g_strndup instead of open-coding it, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 08/22] hw/s390x: Add missing 'static' attribute, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 15/22] do not call g_thread_init() for glib >= 2.31, Michael Tokarev, 2014/05/05
- [Qemu-trivial] [PULL 12/22] hw: Add missing 'static' attributes, Michael Tokarev, 2014/05/05
- Re: [Qemu-trivial] [Qemu-devel] [PULL 00/22] Trivial patches for 2014-05-05, Peter Maydell, 2014/05/07