summaryrefslogtreecommitdiff
path: root/gthread
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2011-08-31 14:01:45 -0400
committerRyan Lortie <desrt@desrt.ca>2011-09-09 12:41:55 -0400
commit5bc7729d16b641022f5eb8a4022515a163063ce9 (patch)
tree5a3e9d6b9a6a6754af856dc55ef9827ce04d33e6 /gthread
parent0d1a2eb4bfcd733e0c015c76fb0ca0308b8a61f0 (diff)
downloadglib-5bc7729d16b641022f5eb8a4022515a163063ce9.tar.gz
Make threads mandatory
G_THREADS_ENABLED still exists, but is always defined. It is still possible to use libglib without threads, but gobject (and everything above it) is now guaranteed to be using threads (as, in fact, it was before, since it was accidentally impossible to compile with --disable-threads). https://bugzilla.gnome.org/show_bug.cgi?id=616754
Diffstat (limited to 'gthread')
-rw-r--r--gthread/gthread-impl.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/gthread/gthread-impl.c b/gthread/gthread-impl.c
index b4836577c..678b3b8fe 100644
--- a/gthread/gthread-impl.c
+++ b/gthread/gthread-impl.c
@@ -36,8 +36,6 @@
#include "glib.h"
#include "gthreadprivate.h"
-#ifdef G_THREADS_ENABLED
-
static GSystemThread zero_thread; /* This is initialized to all zero */
static gboolean thread_system_already_initialized = FALSE;
static gint g_thread_priority_map [G_THREAD_PRIORITY_URGENT + 1];
@@ -359,19 +357,3 @@ g_thread_init (GThreadFunctions* init)
g_thread_init_glib ();
}
-
-#else /* !G_THREADS_ENABLED */
-
-void
-g_thread_init (GThreadFunctions* init)
-{
- g_error ("GLib thread support is disabled.");
-}
-
-void
-g_thread_init_with_errorcheck_mutexes (GThreadFunctions* init)
-{
- g_error ("GLib thread support is disabled.");
-}
-
-#endif /* !G_THREADS_ENABLED */