diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/DatabaseGlue.cxx | 1 | ||||
| -rw-r--r-- | src/PlaylistFile.cxx | 2 | ||||
| -rw-r--r-- | src/PlaylistSave.cxx | 2 | ||||
| -rw-r--r-- | src/event/MultiSocketMonitor.hxx | 1 | ||||
| -rw-r--r-- | src/glib_compat.h | 11 | ||||
| -rw-r--r-- | src/input/CurlInputPlugin.cxx | 1 | ||||
| -rw-r--r-- | src/output/OssOutputPlugin.cxx | 1 | ||||
| -rw-r--r-- | src/pcm_convert.c | 1 | ||||
| -rw-r--r-- | src/utils.c | 1 |
10 files changed, 3 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index ca445880d..192469801 100644 --- a/configure.ac +++ b/configure.ac @@ -472,8 +472,8 @@ AC_ARG_WITH(tremor-includes, dnl --------------------------------------------------------------------------- dnl Mandatory Libraries dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16 gthread-2.0],, - [AC_MSG_ERROR([GLib 2.16 is required])]) +PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.24 gthread-2.0],, + [AC_MSG_ERROR([GLib 2.24 is required])]) if test x$GCC = xyes; then # suppress warnings in the GLib headers diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx index 853e67b07..db7d4b9f3 100644 --- a/src/DatabaseGlue.cxx +++ b/src/DatabaseGlue.cxx @@ -28,7 +28,6 @@ extern "C" { #include "db_error.h" #include "stats.h" -#include "glib_compat.h" } #include "DatabasePlugin.hxx" diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index 278e521ba..f8d924de1 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -37,8 +37,6 @@ extern "C" { #include "uri.h" } -#include "glib_compat.h" - #include <assert.h> #include <sys/types.h> #include <sys/stat.h> diff --git a/src/PlaylistSave.cxx b/src/PlaylistSave.cxx index 1ff6c856b..96fb5b1ca 100644 --- a/src/PlaylistSave.cxx +++ b/src/PlaylistSave.cxx @@ -31,8 +31,6 @@ extern "C" { #include "uri.h" } -#include "glib_compat.h" - #include <glib.h> void diff --git a/src/event/MultiSocketMonitor.hxx b/src/event/MultiSocketMonitor.hxx index 9d0e1502b..bf0a221a2 100644 --- a/src/event/MultiSocketMonitor.hxx +++ b/src/event/MultiSocketMonitor.hxx @@ -22,6 +22,7 @@ #include "check.h" #include "gcc.h" +#include "glib_compat.h" #include <glib.h> diff --git a/src/glib_compat.h b/src/glib_compat.h index 97d1fdc0c..a16b9c6eb 100644 --- a/src/glib_compat.h +++ b/src/glib_compat.h @@ -28,17 +28,6 @@ #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) static inline gint64 diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index 550bcd0ce..fe944b752 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -28,7 +28,6 @@ #include "event/MultiSocketMonitor.hxx" #include "event/Loop.hxx" #include "IOThread.hxx" -#include "glib_compat.h" #include <assert.h> diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx index 5810825f1..ace88b6f4 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/src/output/OssOutputPlugin.cxx @@ -22,7 +22,6 @@ #include "output_api.h" #include "mixer_list.h" #include "fd_util.h" -#include "glib_compat.h" #include <glib.h> diff --git a/src/pcm_convert.c b/src/pcm_convert.c index 32425143a..1d8ae9575 100644 --- a/src/pcm_convert.c +++ b/src/pcm_convert.c @@ -23,7 +23,6 @@ #include "pcm_format.h" #include "pcm_pack.h" #include "audio_format.h" -#include "glib_compat.h" #include <assert.h> #include <string.h> diff --git a/src/utils.c b/src/utils.c index a2de3212e..776813c4b 100644 --- a/src/utils.c +++ b/src/utils.c @@ -19,7 +19,6 @@ #include "config.h" #include "utils.h" -#include "glib_compat.h" #include "conf.h" #include <glib.h> |