diff options
| author | John Snow <jsnow@redhat.com> | 2015-05-22 14:13:42 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-05-22 15:58:06 -0400 |
| commit | 62754b157156c2cd26a00ce534aeec9e74619d95 (patch) | |
| tree | a5725a86f597f2e3573f4bf51b1811b5028dec49 /include/glib-compat.h | |
| parent | f40685c62b802c8c3f5c914e8d357dd5c4d4f9cc (diff) | |
glib: remove stale compat functions
Since we're bumping the version to 2.22+,
remove the now-stale compat functions.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1431469140-22208-2-git-send-email-jsnow@redhat.com
Diffstat (limited to 'include/glib-compat.h')
| -rw-r--r-- | include/glib-compat.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/include/glib-compat.h b/include/glib-compat.h index 28d9f15bd3..318e000368 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -23,14 +23,6 @@ #define G_TIME_SPAN_SECOND (G_GINT64_CONSTANT(1000000)) #endif -#if !GLIB_CHECK_VERSION(2, 14, 0) -static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, - gpointer data) -{ - return g_timeout_add(interval * 1000, function, data); -} -#endif - #if !GLIB_CHECK_VERSION(2, 28, 0) static inline gint64 qemu_g_get_monotonic_time(void) { @@ -47,23 +39,6 @@ static inline gint64 qemu_g_get_monotonic_time(void) #define g_get_monotonic_time() qemu_g_get_monotonic_time() #endif -#if !GLIB_CHECK_VERSION(2, 16, 0) -static inline int g_strcmp0(const char *str1, const char *str2) -{ - int result; - - if (!str1) { - result = -(str1 != str2); - } else if (!str2) { - result = (str1 != str2); - } else { - result = strcmp(str1, str2); - } - - return result; -} -#endif - #ifdef _WIN32 /* * g_poll has a problem on Windows when using @@ -71,16 +46,6 @@ static inline int g_strcmp0(const char *str1, const char *str2) */ #define g_poll(fds, nfds, timeout) g_poll_fixed(fds, nfds, timeout) gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout); -#elif !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 #if !GLIB_CHECK_VERSION(2, 31, 0) |