From b97b7a7493c0535cd21d05189c1a5b7cdd0accb2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 15 Oct 2013 09:35:25 +0200
Subject: require GLib 2.28

The header glib_compat.h is now obsolete and can be removed.
---
 INSTALL                          |  2 +-
 Makefile.am                      |  1 -
 configure.ac                     |  4 ++--
 src/event/MultiSocketMonitor.hxx |  2 --
 src/glib_compat.h                | 43 ----------------------------------------
 5 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 src/glib_compat.h

diff --git a/INSTALL b/INSTALL
index 4258d2999..5c7cd4333 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,7 +13,7 @@ Dependencies
 gcc - http://gcc.gnu.org/
 Any other C99 compliant compiler should also work.
 
-GLib 2.16 - http://www.gtk.org/
+GLib 2.28 - http://www.gtk.org/
 General-purpose utility library.
 
 
diff --git a/Makefile.am b/Makefile.am
index 51b233299..55975fe53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ mpd_headers = \
 	src/check.h \
 	src/command.h \
 	src/gerror.h \
-	src/glib_compat.h \
 	src/TextInputStream.hxx \
 	src/AudioCompress/config.h \
 	src/AudioCompress/compress.h \
diff --git a/configure.ac b/configure.ac
index 87ffd5cbe..0a98943cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,8 +459,8 @@ AC_ARG_WITH(tremor-includes,
 dnl ---------------------------------------------------------------------------
 dnl Mandatory Libraries
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24 gthread-2.0],,
-		[AC_MSG_ERROR([GLib 2.24 is required])])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28 gthread-2.0],,
+		[AC_MSG_ERROR([GLib 2.28 is required])])
 
 if test x$GCC = xyes; then
 	# suppress warnings in the GLib headers
diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx
index da675d98f..8ee81a508 100644
--- a/src/event/MultiSocketMonitor.hxx
+++ b/src/event/MultiSocketMonitor.hxx
@@ -28,9 +28,7 @@
 #include "TimeoutMonitor.hxx"
 #include "SocketMonitor.hxx"
 #else
-#include "glib_compat.h"
 #include <glib.h>
-
 #endif
 
 #include <forward_list>
diff --git a/src/glib_compat.h b/src/glib_compat.h
deleted file mode 100644
index 5277d317e..000000000
--- a/src/glib_compat.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/*
- * Compatibility with older GLib versions.  Some of this isn't
- * implemented properly, just "good enough" to allow users with older
- * operating systems to run MPD.
- */
-
-#ifndef MPD_GLIB_COMPAT_H
-#define MPD_GLIB_COMPAT_H
-
-#include <glib.h>
-
-#if !GLIB_CHECK_VERSION(2,28,0)
-
-#include "system/clock.h"
-
-static inline gint64
-g_source_get_time(GSource *source)
-{
-	return monotonic_clock_us();
-}
-
-#endif
-
-#endif
-- 
cgit v1.2.3