oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

require GLib 2.16

Browse Source 
GLib 2.16 was released more than 4 years ago.  Let's remove some cruft
from the glib_compat.h header, and avoid new cruft to it.
This commit is contained in:
Max Kellermann 2012-07-10 01:21:36 +02:00
parent 2eb14658d3
commit 5dfc0918c3
28 changed files with 5 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -13,7 +13,7 @@ Dependencies
gcc - http://gcc.gnu.org/
Any other C99 compliant compiler should also work.
GLib 2.12 - http://www.gtk.org/
GLib 2.16 - http://www.gtk.org/
General-purpose utility library.

2
Makefile.am
View File

@ -1307,14 +1307,12 @@ test_run_inotify_LDADD = $(GLIB_LIBS)
endif
test_test_byte_reverse_SOURCES = \
test/test_glib_compat.h \
test/test_byte_reverse.c
test_test_byte_reverse_LDADD = \
libutil.a \
$(GLIB_LIBS)
test_test_pcm_SOURCES = \
test/test_glib_compat.h \
test/test_pcm_dither.c \
test/test_pcm_pack.c \
test/test_pcm_channels.c \

4
configure.ac
View File

@ -456,8 +456,8 @@ AC_ARG_WITH(tremor-includes,
dnl ---------------------------------------------------------------------------
dnl Mandatory Libraries
dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.12 gthread-2.0],,
[AC_MSG_ERROR([GLib 2.12 is required])])
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16 gthread-2.0],,
[AC_MSG_ERROR([GLib 2.16 is required])])
if test x$GCC = xyes; then
# suppress warnings in the GLib headers

1
src/conf.c
View File

@ -23,7 +23,6 @@
#include "string_util.h"
#include "tokenizer.h"
#include "path.h"
#include "glib_compat.h"
#include "mpd_error.h"
#include <glib.h>

1
src/db/simple_db_plugin.c
View File

@ -26,7 +26,6 @@
#include "db_save.h"
#include "db_lock.h"
#include "conf.h"
#include "glib_compat.h"
#include "directory.h"
#include <sys/types.h>

58
src/glib_compat.h
View File

@ -28,64 +28,6 @@
#include <glib.h>
#if !GLIB_CHECK_VERSION(2,14,0)
#define g_queue_clear(q) do { g_queue_free(q); q = g_queue_new(); } while (0)
static inline GSource *
g_timeout_source_new_seconds(guint interval)
{
return g_timeout_source_new(interval * 1000);
}
static inline guint
g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data)
{
return g_timeout_add(interval * 1000, function, data);
}
#endif /* !2.14 */
#if !GLIB_CHECK_VERSION(2,16,0)
static inline void
g_prefix_error(G_GNUC_UNUSED GError **error_r,
G_GNUC_UNUSED const gchar *format, ...)
{
}
static inline void
g_propagate_prefixed_error(GError **dest_r, GError *src,
G_GNUC_UNUSED const gchar *format, ...)
{
g_propagate_error(dest_r, src);
}
static inline char *
g_uri_escape_string(const char *unescaped,
G_GNUC_UNUSED const char *reserved_chars_allowed,
G_GNUC_UNUSED gboolean allow_utf8)
{
return g_strdup(unescaped);
}
#endif /* !2.16 */
#if !GLIB_CHECK_VERSION(2,16,0)
#include <string.h>
static inline char *
g_uri_parse_scheme(const char *uri)
{
const char *end = strstr(uri, "://");
if (end == NULL)
return NULL;
return g_strndup(uri, end - uri);
}
#endif
#if !GLIB_CHECK_VERSION(2,18,0)
static inline void

1
src/input_init.c
View File

@ -22,7 +22,6 @@
#include "input_plugin.h"
#include "input_registry.h"
#include "conf.h"
#include "glib_compat.h"
#include <assert.h>
#include <string.h>

1
src/io_thread.c
View File

@ -18,7 +18,6 @@
*/
#include "io_thread.h"
#include "glib_compat.h"
#include <assert.h>

1
src/listen.c
View File

@ -22,7 +22,6 @@
#include "server_socket.h"
#include "client.h"
#include "conf.h"
#include "glib_compat.h"
#include "main.h"
#include <string.h>

1
src/output/httpd_client.c
View File

@ -23,7 +23,6 @@
#include "fifo_buffer.h"
#include "page.h"
#include "icy_server.h"
#include "glib_compat.h"
#include "glib_socket.h"
#include <stdbool.h>

2
src/playlist/despotify_playlist_plugin.c
View File

@ -16,6 +16,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#include "playlist/despotify_playlist_plugin.h"
#include "playlist_plugin.h"
@ -25,7 +26,6 @@
#include "tag.h"
#include "song.h"
#include "input_stream.h"
#include "glib_compat.h"
#include "despotify_utils.h"
#include <glib.h>

1
src/playlist/lastfm_playlist_plugin.c
View File

@ -25,7 +25,6 @@
#include "uri.h"
#include "song.h"
#include "input_stream.h"
#include "glib_compat.h"
#include <glib.h>

1
src/playlist_list.c
View File

@ -35,7 +35,6 @@
#include "uri.h"
#include "string_util.h"
#include "conf.h"
#include "glib_compat.h"
#include "mpd_error.h"
#include <assert.h>

1
src/resolver.c
View File

@ -19,7 +19,6 @@
#include "config.h"
#include "resolver.h"
#include "glib_compat.h"
#ifndef G_OS_WIN32
#include <sys/socket.h>

1
src/server_socket.c
View File

@ -27,7 +27,6 @@
#include "socket_util.h"
#include "resolver.h"
#include "fd_util.h"
#include "glib_compat.h"
#include "glib_socket.h"
#include <sys/types.h>

1
src/state_file.c
View File

@ -24,7 +24,6 @@
#include "playlist_state.h"
#include "volume.h"
#include "text_file.h"
#include "glib_compat.h"
#include <glib.h>
#include <assert.h>

1
src/tcp_connect.c
View File

@ -21,7 +21,6 @@
#include "tcp_connect.h"
#include "fd_util.h"
#include "io_thread.h"
#include "glib_compat.h"
#include "glib_socket.h"
#include <assert.h>

1
src/update_archive.c
View File

@ -24,7 +24,6 @@
#include "directory.h"
#include "song.h"
#include "mapper.h"
#include "glib_compat.h"
#include "archive_list.h"
#include "archive_plugin.h"

1
src/update_container.c
View File

@ -25,7 +25,6 @@
#include "directory.h"
#include "song.h"
#include "mapper.h"
#include "glib_compat.h"
#include "decoder_plugin.h"
#include "tag.h"
#include "tag_handler.h"

1
src/update_io.c
View File

@ -21,6 +21,7 @@
#include "update_io.h"
#include "mapper.h"
#include "directory.h"
#include "glib_compat.h"
#include <glib.h>

1
src/update_song.c
View File

@ -26,7 +26,6 @@
#include "db_lock.h"
#include "directory.h"
#include "song.h"
#include "glib_compat.h"
#include "decoder_list.h"
#include "decoder_plugin.h"

1
src/update_walk.c
View File

@ -33,7 +33,6 @@
#include "mapper.h"
#include "path.h"
#include "playlist_list.h"
#include "glib_compat.h"
#include "conf.h"
#include <glib.h>

1
test/test_byte_reverse.c
View File

@ -18,7 +18,6 @@
*/
#include "util/byte_reverse.h"
#include "test_glib_compat.h"
#include <glib.h>

60
test/test_glib_compat.h
View File

@ -1,60 +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 header for GLib before 2.16.
*/
#ifndef MPD_TEST_GLIB_COMPAT_H
#define MPD_TEST_GLIB_COMPAT_H
#include <glib.h>
#if !GLIB_CHECK_VERSION(2,16,0)
#include <string.h>
#define g_assert_cmpint(n1, cmp, n2) g_assert((n1) cmp (n2))
#define g_assert_cmpstr(a, cmp, b) g_assert(strcmp(a, b) cmp 0)
static void (*test_functions[256])(void);
static unsigned num_test_functions;
static inline void
g_test_init(G_GNUC_UNUSED int *argc, G_GNUC_UNUSED char ***argv, ...)
{
}
static inline void
g_test_add_func(G_GNUC_UNUSED const char *testpath, void (test_funcvoid)(void))
{
test_functions[num_test_functions++] = test_funcvoid;
}
static inline int
g_test_run(void)
{
for (unsigned i = 0; i < num_test_functions; ++i)
test_functions[i]();
return 0;
}
#endif /* !2.16 */
#endif

1
test/test_pcm_channels.c
View File

@ -19,7 +19,6 @@
#include "config.h"
#include "test_pcm_all.h"
#include "test_glib_compat.h"
#include "pcm_channels.h"
#include "pcm_buffer.h"

1
test/test_pcm_dither.c
View File

@ -18,7 +18,6 @@
*/
#include "test_pcm_all.h"
#include "test_glib_compat.h"
#include "pcm_dither.h"
#include <glib.h>

1
test/test_pcm_main.c
View File

@ -18,7 +18,6 @@
*/
#include "test_pcm_all.h"
#include "test_glib_compat.h"
#include <glib.h>

1
test/test_pcm_pack.c
View File

@ -19,7 +19,6 @@
#include "test_pcm_all.h"
#include "pcm_pack.h"
#include "test_glib_compat.h"
#include <glib.h>