Commit 20f85745 authored by Max Kellermann's avatar Max Kellermann

require GLib 2.24

parent feb8d5b8
...@@ -472,8 +472,8 @@ AC_ARG_WITH(tremor-includes, ...@@ -472,8 +472,8 @@ AC_ARG_WITH(tremor-includes,
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl Mandatory Libraries dnl Mandatory Libraries
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16 gthread-2.0],, PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24 gthread-2.0],,
[AC_MSG_ERROR([GLib 2.16 is required])]) [AC_MSG_ERROR([GLib 2.24 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,7 +28,6 @@ ...@@ -28,7 +28,6 @@
extern "C" { extern "C" {
#include "db_error.h" #include "db_error.h"
#include "stats.h" #include "stats.h"
#include "glib_compat.h"
} }
#include "DatabasePlugin.hxx" #include "DatabasePlugin.hxx"
......
...@@ -37,8 +37,6 @@ extern "C" { ...@@ -37,8 +37,6 @@ extern "C" {
#include "uri.h" #include "uri.h"
} }
#include "glib_compat.h"
#include <assert.h> #include <assert.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
......
...@@ -31,8 +31,6 @@ extern "C" { ...@@ -31,8 +31,6 @@ extern "C" {
#include "uri.h" #include "uri.h"
} }
#include "glib_compat.h"
#include <glib.h> #include <glib.h>
void void
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "check.h" #include "check.h"
#include "gcc.h" #include "gcc.h"
#include "glib_compat.h"
#include <glib.h> #include <glib.h>
......
...@@ -28,17 +28,6 @@ ...@@ -28,17 +28,6 @@
#include <glib.h> #include <glib.h>
#if !GLIB_CHECK_VERSION(2,18,0)
static inline void
g_set_error_literal(GError **err, GQuark domain, gint code,
const gchar *message)
{
g_set_error(err, domain, code, "%s", message);
}
#endif
#if !GLIB_CHECK_VERSION(2,28,0) #if !GLIB_CHECK_VERSION(2,28,0)
static inline gint64 static inline gint64
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "event/MultiSocketMonitor.hxx" #include "event/MultiSocketMonitor.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "glib_compat.h"
#include <assert.h> #include <assert.h>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include "output_api.h" #include "output_api.h"
#include "mixer_list.h" #include "mixer_list.h"
#include "fd_util.h" #include "fd_util.h"
#include "glib_compat.h"
#include <glib.h> #include <glib.h>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "pcm_format.h" #include "pcm_format.h"
#include "pcm_pack.h" #include "pcm_pack.h"
#include "audio_format.h" #include "audio_format.h"
#include "glib_compat.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "config.h" #include "config.h"
#include "utils.h" #include "utils.h"
#include "glib_compat.h"
#include "conf.h" #include "conf.h"
#include <glib.h> #include <glib.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment