aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-13 23:27:47 +0200
committerMax Kellermann <max@duempel.org>2012-08-14 01:57:53 +0200
commita582deee2c906562728955de0a13c4ab968d018b (patch)
tree07cb577bd0007bdccdb71e145ad99a06f1cc1e5d
parent12be9e818f01777283d49c8e37f618e4e9731371 (diff)
downloadmpd-a582deee2c906562728955de0a13c4ab968d018b.tar.gz
mpd-a582deee2c906562728955de0a13c4ab968d018b.tar.xz
mpd-a582deee2c906562728955de0a13c4ab968d018b.zip
input_stream, main: remove obsolete GLib version checks
MPD requires GLib 2.16.
-rw-r--r--src/input_stream.h4
-rw-r--r--src/main.c2
-rw-r--r--src/playlist/lastfm_playlist_plugin.c2
3 files changed, 0 insertions, 8 deletions
diff --git a/src/input_stream.h b/src/input_stream.h
index 6a10831d2..10ad97161 100644
--- a/src/input_stream.h
+++ b/src/input_stream.h
@@ -29,10 +29,6 @@
#include <stdbool.h>
#include <sys/types.h>
-#if !GLIB_CHECK_VERSION(2,14,0)
-typedef gint64 goffset;
-#endif
-
struct input_stream {
/**
* the plugin which implements this input stream
diff --git a/src/main.c b/src/main.c
index 4a10f1433..44e4dcf1c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -135,10 +135,8 @@ glue_mapper_init(GError **error_r)
return false;
}
-#if GLIB_CHECK_VERSION(2,14,0)
if (music_dir == NULL)
music_dir = g_strdup(g_get_user_special_dir(G_USER_DIRECTORY_MUSIC));
-#endif
mapper_init(music_dir, playlist_dir);
diff --git a/src/playlist/lastfm_playlist_plugin.c b/src/playlist/lastfm_playlist_plugin.c
index 93768660c..ead14deaa 100644
--- a/src/playlist/lastfm_playlist_plugin.c
+++ b/src/playlist/lastfm_playlist_plugin.c
@@ -58,12 +58,10 @@ lastfm_init(const struct config_param *param)
lastfm_config.user = g_uri_escape_string(user, NULL, false);
-#if GLIB_CHECK_VERSION(2,16,0)
if (strlen(passwd) != 32)
lastfm_config.md5 = g_compute_checksum_for_string(G_CHECKSUM_MD5,
passwd, strlen(passwd));
else
-#endif
lastfm_config.md5 = g_strdup(passwd);
return true;