Make GraphicsConverter threadsafe

[lyx.git] / src / support / os_unix.cpp

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index b8a94b2c5680e8a194be628bad162afd56df8d3b..03dfb381c22480c03d08fcfaac692bb7154d4007 100644 (file)
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #ifdef __APPLE__
-#include <Carbon/Carbon.h>
+#include <CoreServices/CoreServices.h>
 #endif
 
 using namespace std;
@@ -46,12 +46,15 @@ void init(int argc, char * argv[])
 {
        argc_ = argc;
        argv_ = argv;
+
+       // Set environment's default locale
+       setlocale(LC_ALL, "");
 }
 
 
 string utf8_argv(int i)
 {
-       LASSERT(i < argc_, /**/);
+       LASSERT(i < argc_, return "");
        return to_utf8(from_local8bit(argv_[i]));
 }
 
@@ -222,12 +225,6 @@ shell_type shell()
 }
 
 
-int timeout_min()
-{
-       return 3;
-}
-
-
 char path_separator(path_type)
 {
        return ':';