Fix the Mac OS X build after 40441cfd

 * std::setlocale has issues under Mac OS X, use the C version instead

Change-Id: I7c65ec83948d7cce23dfd0fca07c7d0206326d5d

diff --git a/scilab/modules/core/src/cpp/InitScilab.cpp b/scilab/modules/core/src/cpp/InitScilab.cpp
index 66f65f3..8266138 100644 (file)
--- a/scilab/modules/core/src/cpp/InitScilab.cpp
+++ b/scilab/modules/core/src/cpp/InitScilab.cpp
@@ -16,7 +16,6 @@
 
 #include <string>
 #include <libxml/parser.h>
-#include <clocale>
 
 #include "inspector.hxx"
 #include "double.hxx"
@@ -42,6 +41,7 @@
 
 extern "C"
 {
+#include <locale.h>
 #include "machine.h"
 #include "InitializeLocalization.h"
 #include "elem_common.h"
@@ -184,7 +184,7 @@ int StartScilabEngine(ScilabEngineInfo* _pSEI)
 #endif
 
     // Make sure the default locale is applied at startup
-    std::setlocale(LC_NUMERIC, "C");
+    setlocale(LC_NUMERIC, "C");
 
     ThreadManagement::initialize();
     NumericConstants::Initialize();