aboutsummaryrefslogtreecommitdiffstats
path: root/src/glib_compat.h
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-07-10 01:21:36 +0200
committerMax Kellermann <max@duempel.org>2012-07-10 01:28:52 +0200
commit5dfc0918c37c40063b92a55c365ec87e29f0ecef (patch)
treec3ec06f3adbff49190765e392579a8424c9e17d8 /src/glib_compat.h
parent2eb14658d3eb06e827f8f1f045f4f12888db4e26 (diff)
downloadmpd-5dfc0918c37c40063b92a55c365ec87e29f0ecef.tar.gz
mpd-5dfc0918c37c40063b92a55c365ec87e29f0ecef.tar.xz
mpd-5dfc0918c37c40063b92a55c365ec87e29f0ecef.zip
require GLib 2.16
GLib 2.16 was released more than 4 years ago. Let's remove some cruft from the glib_compat.h header, and avoid new cruft to it.
Diffstat (limited to 'src/glib_compat.h')
-rw-r--r--src/glib_compat.h58
1 files changed, 0 insertions, 58 deletions
diff --git a/src/glib_compat.h b/src/glib_compat.h
index 989bf3b81..97d1fdc0c 100644
--- a/src/glib_compat.h
+++ b/src/glib_compat.h
@@ -28,64 +28,6 @@
#include <glib.h>
-#if !GLIB_CHECK_VERSION(2,14,0)
-
-#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)
-
-static inline GSource *
-g_timeout_source_new_seconds(guint interval)
-{
- return g_timeout_source_new(interval * 1000);
-}
-
-static inline guint
-g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)
-{
- return g_timeout_add(interval * 1000, function, data);
-}
-
-#endif /* !2.14 */
-
-#if !GLIB_CHECK_VERSION(2,16,0)
-
-static inline void
-g_prefix_error(G_GNUC_UNUSED GError **error_r,
- G_GNUC_UNUSED const gchar *format, ...)
-{
-}
-
-static inline void
-g_propagate_prefixed_error(GError **dest_r, GError *src,
- G_GNUC_UNUSED const gchar *format, ...)
-{
- g_propagate_error(dest_r, src);
-}
-
-static inline char *
-g_uri_escape_string(const char *unescaped,
- G_GNUC_UNUSED const char *reserved_chars_allowed,
- G_GNUC_UNUSED gboolean allow_utf8)
-{
- return g_strdup(unescaped);
-}
-
-#endif /* !2.16 */
-
-#if !GLIB_CHECK_VERSION(2,16,0)
-
-#include <string.h>
-
-static inline char *
-g_uri_parse_scheme(const char *uri)
-{
- const char *end = strstr(uri, "://");
- if (end == NULL)
- return NULL;
- return g_strndup(uri, end - uri);
-}
-
-#endif
-
#if !GLIB_CHECK_VERSION(2,18,0)
static inline void