Fix bugs #6078 and #9364

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

diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index 389b4e2f78d797a281624fbdeca8bed7e762317f..572273ce2c9c670dc0f5ae7e1ed8965254ccd9e2 100644 (file)
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -215,6 +215,10 @@ void init(int argc, char * argv[])
        argc_ = argc;
        argv_ = argv;
 
+       // Set environment's default locale
+       setlocale(LC_ALL, "");
+       setlocale(LC_NUMERIC, "C");
+
        // Make sure that the TEMP variable is set
        // and sync the Windows environment.
        setenv("TEMP", "/tmp", false);
@@ -227,7 +231,7 @@ void init(int argc, char * argv[])
 
 string utf8_argv(int i)
 {
-       LASSERT(i < argc_, /**/);
+       LASSERT(i < argc_, return "");
        return to_utf8(from_local8bit(argv_[i]));
 }
 
@@ -398,12 +402,6 @@ shell_type shell()
 }
 
 
-int timeout_min()
-{
-       return 3;
-}
-
-
 char path_separator(path_type type)
 {
        if (type == TEXENGINE)
@@ -451,7 +449,7 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode,
        // reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
        string const win_path = to_local8bit(from_utf8(convert_path(filename, PathStyle(windows))));
        char const * action = (mode == VIEW) ? "open" : "edit";
-       bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
+       bool success = reinterpret_cast<long>(ShellExecute(NULL, action,
                                        win_path.c_str(), NULL, NULL, 1)) > 32;
 
        if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {