From ae87abae593e7baf07b547d8348c31213838e437 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 1 Mar 2009 00:37:22 +0100
Subject: [PATCH] use GLIB_CHECK_VERSION()
Use GLIB_CHECK_VERSION() instead of manually checking
GLIB_MAJOR_VERSION, ...
---
src/cmdline.c | 4 ++--
src/input_curl.c | 2 +-
src/mapper.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/cmdline.c b/src/cmdline.c
index 3941a143b..b0cdbfb2f 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -66,7 +66,7 @@ static void version(void)
exit(EXIT_SUCCESS);
}
-#if GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 12)
+#if GLIB_CHECK_VERSION(2,12,0)
static const char *summary =
"Music Player Daemon - a daemon for playing music.";
#endif
@@ -108,7 +108,7 @@ void parseOptions(int argc, char **argv, Options *options)
context = g_option_context_new("[path/to/mpd.conf]");
g_option_context_add_main_entries(context, entries, NULL);
-#if GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 12)
+#if GLIB_CHECK_VERSION(2,12,0)
g_option_context_set_summary(context, summary);
#endif
diff --git a/src/input_curl.c b/src/input_curl.c
index f99cba7d1..47fc594e8 100644
--- a/src/input_curl.c
+++ b/src/input_curl.c
@@ -119,7 +119,7 @@ buffer_free_callback(gpointer data, G_GNUC_UNUSED gpointer user_data)
}
/* g_queue_clear() was introduced in GLib 2.14 */
-#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 14
+#if GLIB_CHECK_VERSION(2,14,0)
#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)
#endif
diff --git a/src/mapper.c b/src/mapper.c
index b167479dd..66bdeebaa 100644
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -96,7 +96,7 @@ void mapper_init(void)
path = config_get_path(CONF_MUSIC_DIR);
if (path != NULL)
mapper_set_music_dir(path);
-#if GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 14)
+#if GLIB_CHECK_VERSION(2,14,0)
else {
path = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
if (path != NULL)