ICU-511.25.tar.gz

[apple/icu.git] / icuSources / common / uinit.c

diff --git a/icuSources/common/uinit.c b/icuSources/common/uinit.c
index bdbf9102e3bf41ead2f95f59cafb291f252f0e0b..db3f252c5fbfe4724a83254ca14a4f050d14ac4d 100644 (file)
--- a/icuSources/common/uinit.c
+++ b/icuSources/common/uinit.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *                                                                            *
-* Copyright (C) 2001-2011, International Business Machines                   *
+* Copyright (C) 2001-2012, International Business Machines                   *
 *                Corporation and others. All Rights Reserved.                *
 *                                                                            *
 ******************************************************************************
@@ -21,25 +21,11 @@
 #include "icuplugimp.h"
 #include "ucln.h"
 #include "ucnv_io.h"
-#include "umutex.h"
 #include "utracimp.h"
 
-/*
- * ICU Initialization Function. Need not be called.
- */
-U_CAPI void U_EXPORT2
-u_init(UErrorCode *status) {
-    UTRACE_ENTRY_OC(UTRACE_U_INIT);
-    /* initialize plugins */
-    uplug_init(status);
-
-    umtx_lock(&gICUInitMutex);
-    if (gICUInitialized || U_FAILURE(*status)) {
-        umtx_unlock(&gICUInitMutex);
-        UTRACE_EXIT_STATUS(*status);
-        return;
-    }
-
+static void U_CALLCONV
+initData(UErrorCode *status)
+{
     /*
      * 2005-may-02
      *
@@ -55,8 +41,18 @@ u_init(UErrorCode *status) {
 #if !UCONFIG_NO_CONVERSION
     ucnv_io_countKnownConverters(status);
 #endif
+}
+
+/*
+ * ICU Initialization Function. Need not be called.
+ */
+U_CAPI void U_EXPORT2
+u_init(UErrorCode *status) {
+    UTRACE_ENTRY_OC(UTRACE_U_INIT);
+
+    /* initialize plugins */
+    uplug_init(status);
+    ucln_mutexedInit(initData, status);
 
-    gICUInitialized = TRUE;    /* TODO:  don't set if U_FAILURE? */
-    umtx_unlock(&gICUInitMutex);
     UTRACE_EXIT_STATUS(*status);
 }