From: rnv <rnv@opencascade.com>
Date: Wed, 19 Jun 2019 12:27:06 +0000 (+0300)
Subject: Compilation on Windows.
X-Git-Tag: EMC2P_V1_1_0^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9b6be3949a33b8590d96c9204dcedcb7a8b2e94f;p=modules%2Fkernel.git

Compilation on Windows.
---

diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx
index 608fda19d..7e2f7c6c9 100644
--- a/src/Container/SALOME_ContainerManager.cxx
+++ b/src/Container/SALOME_ContainerManager.cxx
@@ -1404,7 +1404,11 @@ long SALOME_ContainerManager::SystemWithPIDThreadSafe(const std::vector<std::str
   Utils_Locker lock(&_systemMutex);
   if(command.size()<1)
     throw SALOME_Exception("SystemWithPIDThreadSafe : command is expected to have a length of size 1 at least !");
+#ifndef WIN32
   pid_t pid ( fork() ) ; // spawn a child process, following code is executed in both processes
+#else 
+  pid_t pid = -1; //Throw SALOME_Exception on Windows
+#endif
   if ( pid == 0 ) // I'm a child, replace myself with a new ompi-server
     {
       std::size_t sz(command.size());
diff --git a/src/Launcher/SALOME_ExternalServerLauncher.cxx b/src/Launcher/SALOME_ExternalServerLauncher.cxx
index 2f2bc73d4..4574819ee 100644
--- a/src/Launcher/SALOME_ExternalServerLauncher.cxx
+++ b/src/Launcher/SALOME_ExternalServerLauncher.cxx
@@ -27,12 +27,18 @@
 
 #include CORBA_CLIENT_HEADER(SALOME_ExternalServerLauncher)
 
+#ifndef WIN32
 #include <unistd.h>
+#else
+#include <windows.h>
+#include <Basics_Utils.hxx>
+#endif
 
 #include <sstream>
 #include <fstream>
 #include <algorithm>
 #include <memory>
+#include <functional>
 
 constexpr char NAME_IN_NS[]="/ExternalServers";
 
@@ -55,8 +61,23 @@ SALOME_ExternalServerLauncher::~SALOME_ExternalServerLauncher()
 class ChdirRAII
 {
 public:
+#ifndef WIN32
   ChdirRAII(const std::string& wd):_wd(wd) { if(_wd.empty()) return ; char *pwd(get_current_dir_name()); _od = pwd; free(pwd); chdir(_wd.c_str()); }
   ~ChdirRAII() { if(_od.empty()) return ; chdir(_od.c_str()); }
+#else
+	ChdirRAII(const std::string& wd) : _wd(wd) { 
+		if (_wd.empty()) 
+			return;
+		TCHAR pwd[MAX_PATH];
+		GetCurrentDirectory(sizeof(pwd), pwd);
+		_od = Kernel_Utils::utf8_encode_s(pwd);
+		SetCurrentDirectory(Kernel_Utils::utf8_decode_s(_wd).c_str());
+	}
+	~ChdirRAII() { 
+		if (_od.empty()) return; 
+		SetCurrentDirectory(Kernel_Utils::utf8_decode_s(_od).c_str());
+	}
+#endif	
 private:
   std::string _wd;
   std::string _od;