aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-15 09:35:25 +0200
committerMax Kellermann <max@duempel.org>2013-10-15 09:35:25 +0200
commitb97b7a7493c0535cd21d05189c1a5b7cdd0accb2 (patch)
tree2f4f31d3f7065528dcd795c788d37881b0075e42 /src
parentbe2951b45fe071ae7e4957414c7b23e72fbac07a (diff)
downloadmpd-b97b7a7493c0535cd21d05189c1a5b7cdd0accb2.tar.gz
mpd-b97b7a7493c0535cd21d05189c1a5b7cdd0accb2.tar.xz
mpd-b97b7a7493c0535cd21d05189c1a5b7cdd0accb2.zip
require GLib 2.28
The header glib_compat.h is now obsolete and can be removed.
Diffstat (limited to 'src')
-rw-r--r--src/event/MultiSocketMonitor.hxx2
-rw-r--r--src/glib_compat.h43
2 files changed, 0 insertions, 45 deletions
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