[cogl/wip/cogl-1.14: 7/177] core: Don't use g_once_*() API



commit 24fa64bea2ab64649afe2f092198d2ae2adfdaee
Author: Damien Lespiau <damien lespiau intel com>
Date:   Wed Sep 12 23:47:17 2012 +0100

    core: Don't use g_once_*() API
    
    As Cogl is not thread safe, we don't really need a thread safe
    cogl_init() function.
    
    This also reduces the amount of dependency cogl has on glib, handy when
    we want to create a standalone version of cogl, some day.
    
    Reviewed-by: Neil Roberts <neil linux intel com>
    (cherry picked from commit 429e49e3028a425eb198d8969dfbf57790e2e72a)

 cogl/cogl.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/cogl/cogl.c b/cogl/cogl.c
index 6ab38c5..5fd63fc 100644
--- a/cogl/cogl.c
+++ b/cogl/cogl.c
@@ -793,9 +793,9 @@ _cogl_error_quark (void)
 void
 _cogl_init (void)
 {
-  static size_t init_status = 0;
+  static CoglBool initialized = FALSE;
 
-  if (g_once_init_enter (&init_status))
+  if (initialized == FALSE)
     {
       bindtextdomain (GETTEXT_PACKAGE, COGL_LOCALEDIR);
       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -804,7 +804,7 @@ _cogl_init (void)
 
       _cogl_config_read ();
       _cogl_debug_check_environment ();
-      g_once_init_leave (&init_status, 1);
+      initialized = TRUE;
     }
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]