Implement os::current_root for native Win32 builds.

[lyx.git] / src / main.C

diff --git a/src/main.C b/src/main.C
index b6366d73e61a797190c9463111e2ca03f50ec66a..184549aa1a9311eb0e3b2c72aa4bca4a2c486dad 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -11,8 +11,10 @@
 
 #include <config.h>
 
+#include "debug.h"
 #include "lyx_main.h"
 #include "gettext.h"
+
 #include "support/os.h"
 
 #ifdef HAVE_IOS
@@ -22,14 +24,17 @@
 
 namespace os = lyx::support::os;
 
-
 int main(int argc, char * argv[])
 {
 #ifdef HAVE_IOS
        std::ios_base::sync_with_stdio(false);
 #endif
+       // To avoid ordering of global object problems with some
+       // stdlibs we do the initialization here, but still as
+       // early as possible.
+       lyxerr.rdbuf(std::cerr.rdbuf());
 
-       os::init(&argc, &argv);
+       os::init(argc, argv);
 
        // initialize for internationalized version *EK*
        locale_init();