Changeset 18055 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 18, 2009 12:01:51 PM (16 years ago)

Author:

vboxsync

Message:

Runtime: call setlocale from RTR3Init, not as a global initialiser

Location:

trunk/src/VBox/Runtime

Files:

• common/string/string.cpp (modified) (1 diff)
• r3/init.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/string.cpp

@@ -38 +38 @@
 #include <iprt/err.h>
 #include "internal/string.h"
-
-#include <locale.h>
-
-
-/**
- * Init C runtime locale
- * note: actually where is no need in this global var, use it only for
- * auto run of setlocale() func.
- */
-/** @todo rewrite this to do setlocale() from some proper init function. */
-static int g_RTLocaleInited = (setlocale(LC_CTYPE, "") != NULL);
-
 
 /**

trunk/src/VBox/Runtime/r3/init.cpp

@@ -55 +55 @@
 # include <stdlib.h>
 #endif
+
+#include <locale.h>
+
 #include "internal/path.h"
 #include "internal/process.h"
@@ -260 +263 @@
     g_u64ProgramStartMilliTS = g_u64ProgramStartNanoTS / 1000000;
 
+    /**
+     * Init C runtime locale
+     */
+    char *pcDummy = setlocale(LC_CTYPE, "");
+
     /*
      * More stuff to come?