require GLib 2.28
The header glib_compat.h is now obsolete and can be removed.
This commit is contained in:
2
INSTALL
2
INSTALL
@@ -13,7 +13,7 @@ Dependencies
|
|||||||
gcc - http://gcc.gnu.org/
|
gcc - http://gcc.gnu.org/
|
||||||
Any other C99 compliant compiler should also work.
|
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.
|
General-purpose utility library.
|
||||||
|
|
||||||
|
|
||||||
|
@@ -54,7 +54,6 @@ mpd_headers = \
|
|||||||
src/check.h \
|
src/check.h \
|
||||||
src/command.h \
|
src/command.h \
|
||||||
src/gerror.h \
|
src/gerror.h \
|
||||||
src/glib_compat.h \
|
|
||||||
src/TextInputStream.hxx \
|
src/TextInputStream.hxx \
|
||||||
src/AudioCompress/config.h \
|
src/AudioCompress/config.h \
|
||||||
src/AudioCompress/compress.h \
|
src/AudioCompress/compress.h \
|
||||||
|
@@ -459,8 +459,8 @@ AC_ARG_WITH(tremor-includes,
|
|||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
dnl Mandatory Libraries
|
dnl Mandatory Libraries
|
||||||
dnl ---------------------------------------------------------------------------
|
dnl ---------------------------------------------------------------------------
|
||||||
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24 gthread-2.0],,
|
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28 gthread-2.0],,
|
||||||
[AC_MSG_ERROR([GLib 2.24 is required])])
|
[AC_MSG_ERROR([GLib 2.28 is required])])
|
||||||
|
|
||||||
if test x$GCC = xyes; then
|
if test x$GCC = xyes; then
|
||||||
# suppress warnings in the GLib headers
|
# suppress warnings in the GLib headers
|
||||||
|
@@ -28,9 +28,7 @@
|
|||||||
#include "TimeoutMonitor.hxx"
|
#include "TimeoutMonitor.hxx"
|
||||||
#include "SocketMonitor.hxx"
|
#include "SocketMonitor.hxx"
|
||||||
#else
|
#else
|
||||||
#include "glib_compat.h"
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <forward_list>
|
#include <forward_list>
|
||||||
|
@@ -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
|
|
Reference in New Issue
Block a user