From 389d24727839b1a3ba0696c63277d0e867dfb73f Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 7 Oct 2011 15:06:37 +0100 Subject: [PATCH] texture: Drop G_MUTEX_INIT MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The static initializer for GMutex has been removed from GLib. The g_thread_supported() call can also be removed: threading is always enabled in GLib ≥ 2.31. --- clutter/clutter-texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index 2c3c4e7..3e7516d 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -167,7 +167,7 @@ static int texture_signals[LAST_SIGNAL] = { 0 }; static GThreadPool *async_thread_pool = NULL; static guint repaint_upload_func = 0; static GList *upload_list = NULL; -static GMutex upload_list_mutex = G_MUTEX_INIT; +static GMutex upload_list_mutex; static CoglMaterial *texture_template_material = NULL; @@ -1941,7 +1941,7 @@ clutter_texture_async_load (ClutterTexture *self, priv->async_data = data; - if (g_thread_supported ()) + if (1) { if (G_UNLIKELY (async_thread_pool == NULL)) { -- 2.7.4