* common-src/glib-util.c: g_thread_supported always return TRUE on

newer version. git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/trunk@4594 a8d146d6-cc15-0410-8900-af154a0219e0
zmanda · Mar 11, 2012 · a32b906 · a32b906
1 parent b777909
commit a32b906
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-11  Jean-Louis Martineau <martineau@zmanda.com>
+	* common-src/glib-util.c: g_thread_supported always return TRUE on
+	  newer version.
+
 2012-03-10  Jean-Louis Martineau <martineau@zmanda.com>
 	* common-src/glib-util.c, common-src/glib-util.h: Remove
 	  g_queue_free_full.

diff --git a/common-src/glib-util.c b/common-src/glib-util.c
@@ -42,7 +42,9 @@ glib_init(void) {
      * is initialized) */
 #ifdef HAVE_LIBCURL
 # ifdef G_THREADS_ENABLED
+#  if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 31))
     g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */
+#  endif
 # endif
     g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0);
 #endif