Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
b97b7a74
Commit
b97b7a74
authored
Oct 15, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
require GLib 2.28
The header glib_compat.h is now obsolete and can be removed.
parent
be2951b4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
49 deletions
+3
-49
INSTALL
INSTALL
+1
-1
Makefile.am
Makefile.am
+0
-1
configure.ac
configure.ac
+2
-2
MultiSocketMonitor.hxx
src/event/MultiSocketMonitor.hxx
+0
-2
glib_compat.h
src/glib_compat.h
+0
-43
No files found.
INSTALL
View file @
b97b7a74
...
...
@@ -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.
...
...
Makefile.am
View file @
b97b7a74
...
...
@@ -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
\
...
...
configure.ac
View file @
b97b7a74
...
...
@@ -459,8 +459,8 @@ AC_ARG_WITH(tremor-includes,
dnl ---------------------------------------------------------------------------
dnl Mandatory Libraries
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.2
4
gthread-2.0],,
[AC_MSG_ERROR([GLib 2.2
4
is required])])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.2
8
gthread-2.0],,
[AC_MSG_ERROR([GLib 2.2
8
is required])])
if test x$GCC = xyes; then
# suppress warnings in the GLib headers
...
...
src/event/MultiSocketMonitor.hxx
View file @
b97b7a74
...
...
@@ -28,9 +28,7 @@
#include "TimeoutMonitor.hxx"
#include "SocketMonitor.hxx"
#else
#include "glib_compat.h"
#include <glib.h>
#endif
#include <forward_list>
...
...
src/glib_compat.h
deleted
100644 → 0
View file @
be2951b4
/*
* 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment