ICU-400.37.tar.gz

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

diff --git a/icuSources/common/uinit.c b/icuSources/common/uinit.c
index a70e51d0e6f7a6c87562d6be4c4cfbd023baec74..1f2c6d6b8f8b78a4f9ee2a06565f0796d146138d 100644 (file)
--- a/icuSources/common/uinit.c
+++ b/icuSources/common/uinit.c
@@ -1,7 +1,7 @@
 /*
 ******************************************************************************
 *                                                                            *
 /*
 ******************************************************************************
 *                                                                            *

-* Copyright (C) 2001-2006, International Business Machines                   *
+* Copyright (C) 2001-2007, International Business Machines                   *

 *                Corporation and others. All Rights Reserved.                *
 *                                                                            *
 ******************************************************************************
 *                Corporation and others. All Rights Reserved.                *
 *                                                                            *
 ******************************************************************************


@@ -48,9 +48,9 @@ u_cleanup(void)
     cmemory_cleanup();       /* undo any heap functions set by u_setMemoryFunctions(). */
     gICUInitialized = FALSE;
     UTRACE_EXIT();           /* Must be before utrace_cleanup(), which turns off tracing. */
     cmemory_cleanup();       /* undo any heap functions set by u_setMemoryFunctions(). */
     gICUInitialized = FALSE;
     UTRACE_EXIT();           /* Must be before utrace_cleanup(), which turns off tracing. */

-#if U_ENABLE_TRACING
+/*#if U_ENABLE_TRACING*/

     utrace_cleanup();
     utrace_cleanup();

-#endif
+/*#endif*/

 }
 
 /*
 }
 
 /*


@@ -85,7 +85,7 @@ u_init(UErrorCode *status) {
      * available.
      */
 #if !UCONFIG_NO_CONVERSION
      * available.
      */
 #if !UCONFIG_NO_CONVERSION

-    ucnv_io_countTotalAliases(status);
+    ucnv_io_countKnownConverters(status);

 #endif
 #else
     /* Do any required init for services that don't have open operations
 #endif
 #else
     /* Do any required init for services that don't have open operations