oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

test/DumpDatabase, ...: no g_thread_init() calls when GLib is disabled

Browse Source
This commit is contained in:
Max Kellermann
2014-10-24 18:30:30 +02:00
parent a7b09d3d1c
commit 6cf1acfb48
3 changed files with 12 additions and 0 deletions

4
test/DumpDatabase.cxx

@ -33,7 +33,9 @@
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
#endif
#include <iostream> #include <iostream>
using std::cout; using std::cout;
@ -107,8 +109,10 @@ main(int argc, char **argv)
/* initialize GLib */ /* initialize GLib */
#ifdef HAVE_GLIB
#if !GLIB_CHECK_VERSION(2,32,0) #if !GLIB_CHECK_VERSION(2,32,0)
g_thread_init(nullptr); g_thread_init(nullptr);
#endif
#endif #endif
/* initialize MPD */ /* initialize MPD */

4
test/read_mixer.cxx

@ -28,7 +28,9 @@
#include "util/Error.hxx" #include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
#endif
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -50,8 +52,10 @@ int main(int argc, gcc_unused char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
#ifdef HAVE_GLIB
#if !GLIB_CHECK_VERSION(2,32,0) #if !GLIB_CHECK_VERSION(2,32,0)
g_thread_init(NULL); g_thread_init(NULL);
#endif
#endif #endif
EventLoop event_loop; EventLoop event_loop;

4
test/visit_archive.cxx

@ -30,7 +30,9 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#ifdef HAVE_GLIB
#include <glib.h> #include <glib.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -57,8 +59,10 @@ main(int argc, char **argv)
/* initialize GLib */ /* initialize GLib */
#ifdef HAVE_GLIB
#if !GLIB_CHECK_VERSION(2,32,0) #if !GLIB_CHECK_VERSION(2,32,0)
g_thread_init(NULL); g_thread_init(NULL);
#endif
#endif #endif
/* initialize MPD */ /* initialize MPD */