require GLib 2.16

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

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>

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>

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

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>

View File

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

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>

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>

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>

View File

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

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>

View File

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

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>

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>

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>

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"

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"

View File

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

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"

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>