diff options
author | Max Kellermann <max@duempel.org> | 2012-07-10 01:21:36 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2012-07-10 01:28:52 +0200 |
commit | 5dfc0918c37c40063b92a55c365ec87e29f0ecef (patch) | |
tree | c3ec06f3adbff49190765e392579a8424c9e17d8 /test/test_glib_compat.h | |
parent | 2eb14658d3eb06e827f8f1f045f4f12888db4e26 (diff) | |
download | mpd-5dfc0918c37c40063b92a55c365ec87e29f0ecef.tar.gz mpd-5dfc0918c37c40063b92a55c365ec87e29f0ecef.tar.xz mpd-5dfc0918c37c40063b92a55c365ec87e29f0ecef.zip |
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.
Diffstat (limited to 'test/test_glib_compat.h')
-rw-r--r-- | test/test_glib_compat.h | 60 |
1 files changed, 0 insertions, 60 deletions
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 |