From b0ab7aba6bf2d70e0546f85091d76d9f83174ce8 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Sun, 16 Oct 2011 21:59:55 -0400
Subject: [PATCH] push G_THREADS_MANDATORY over the cliff

This was used as an optimisation for the macro hackery that used to live
in gthread.h.  If a particular library or program knew that it could
rely on thread support being enabled, it would allow for static
evaluation of conditionals in some of those macros.

Since the macros are dead and thread support is now always-on, we can
get rid of this bit of legacy.
---
 gio/Makefile.am           | 2 --
 glib/Makefile.am          | 1 -
 glib/deprecated/gthread.h | 6 +-----
 gobject/Makefile.am       | 2 --
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 698fa92d2..b715e3c0f 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -37,8 +37,6 @@ AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"GLib-GIO\"			\
 	$(gmodule_INCLUDES)				\
 	$(GLIB_DEBUG_FLAGS)				\
-	-DG_THREADS_MANDATORY				\
-	-DG_DISABLE_DEPRECATED				\
 	-DGIO_COMPILATION				\
 	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	
 
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 22dbe4def..b9ad6b56c 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -51,7 +51,6 @@ AM_CPPFLAGS = 				\
 	$(pcre_inc) 			\
 	-DG_LOG_DOMAIN=\"GLib\" 	\
 	$(GLIB_DEBUG_FLAGS) 		\
-	-DG_DISABLE_DEPRECATED 		\
 	-DGLIB_COMPILATION 		\
 	-DPCRE_STATIC
 
diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
index 6dc0b7f2c..095ecc28e 100644
--- a/glib/deprecated/gthread.h
+++ b/glib/deprecated/gthread.h
@@ -265,11 +265,7 @@ gboolean g_thread_get_initialized        (void);
 
 GLIB_VAR gboolean g_threads_got_initialized;
 
-#if defined(G_THREADS_MANDATORY)
-#define g_thread_supported()     1
-#else
-#define g_thread_supported()    (g_threads_got_initialized)
-#endif
+#define g_thread_supported()     (1)
 
 GLIB_DEPRECATED
 GMutex *        g_mutex_new             (void);
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 7e02c83ab..5c84699eb 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -13,8 +13,6 @@ AM_CPPFLAGS = 					\
 	-DG_LOG_DOMAIN=\"GLib-GObject\"		\
 	$(gthread_INCLUDES) 			\
 	$(GLIB_DEBUG_FLAGS)			\
-	-DG_THREADS_MANDATORY			\
-	-DG_DISABLE_DEPRECATED			\
 	-DGOBJECT_COMPILATION
 
 gobject.def: gobject.symbols