windows port

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index e412a7911eec8bd7a8c524d1d605cc7bcbbc7710..c874c7781296e2d4c0e117ae856d573c11cd76a2 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -160,7 +160,7 @@ ResourcesManager_cpp::GetFittingResources(const machineParams& params) throw(Res
 
   // PaCO++ parallel container case
   std::string parallelLib(params.parallelLib);
-  if (params.nb_component_nodes > 0 and parallelLib != "")
+  if (params.nb_component_nodes > 0 && parallelLib != "")
   {
 #if defined(_DEBUG_) || defined(_DEBUG)
     std::cerr << "[GetFittingResources] ParallelContainer case" << std::endl;

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index 1287d99b30ecbe8216caeeeadf9ff9013d3f5df5..9d95ee3f72d0e6a8e5637d5c12d49ee15d606b4c 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -33,7 +33,10 @@
 #include "SALOME_LoadRateManager.hxx"
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef WNT
+#else
 #include <unistd.h>
+#endif
 
 // --- WARNING ---
 // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done