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.

6 files changed, 0 insertions, 65 deletions

diff --git a/test/test_byte_reverse.c b/test/test_byte_reverse.c
index 7678e9cef..08a107622 100644
--- a/test/test_byte_reverse.c
+++ b/test/test_byte_reverse.c
@@ -18,7 +18,6 @@
  */
 
 #include "util/byte_reverse.h"
-#include "test_glib_compat.h"
 
 #include <glib.h>
 
diff --git a/test/test_glib_compat.h b/test/test_glib_compat.h
deleted file mode 100644
index 2e4ab123c..000000000
--- a/test/test_glib_compat.h
+++ /dev/null
@@ -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
diff --git a/test/test_pcm_channels.c b/test/test_pcm_channels.c
index 877ae3262..fb3ec5c3e 100644
--- a/test/test_pcm_channels.c
+++ b/test/test_pcm_channels.c
@@ -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"
 
diff --git a/test/test_pcm_dither.c b/test/test_pcm_dither.c
index 24b0dd040..44d105207 100644
--- a/test/test_pcm_dither.c
+++ b/test/test_pcm_dither.c
@@ -18,7 +18,6 @@
  */
 
 #include "test_pcm_all.h"
-#include "test_glib_compat.h"
 #include "pcm_dither.h"
 
 #include <glib.h>
diff --git a/test/test_pcm_main.c b/test/test_pcm_main.c
index 7047b5251..43a849836 100644
--- a/test/test_pcm_main.c
+++ b/test/test_pcm_main.c
@@ -18,7 +18,6 @@
  */
 
 #include "test_pcm_all.h"
-#include "test_glib_compat.h"
 
 #include <glib.h>
 
diff --git a/test/test_pcm_pack.c b/test/test_pcm_pack.c
index de5d8b6e5..5127536fb 100644
--- a/test/test_pcm_pack.c
+++ b/test/test_pcm_pack.c
@@ -19,7 +19,6 @@
 
 #include "test_pcm_all.h"
 #include "pcm_pack.h"
-#include "test_glib_compat.h"
 
 #include <glib.h>