Replace deprecated WNT macro definition by WIN32.

diff --git a/src/Basics/BasicsGenericDestructor.hxx b/src/Basics/BasicsGenericDestructor.hxx
index 49053d3c63f93750ea6be4518fd19d2622286bf5..22b645de7309d3e187e9ff545644ad6664d2b971 100644 (file)
--- a/src/Basics/BasicsGenericDestructor.hxx
+++ b/src/Basics/BasicsGenericDestructor.hxx
@@ -49,7 +49,7 @@
 #define DEVTRACE(msg)
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #endif
 

diff --git a/src/Container/Component_i.cxx b/src/Container/Component_i.cxx
index 50a6a90f9db2a8b2fa48c57b8ba259bb14b23417..454d821986e5b94ef858a7d6dc672a258817db53 100644 (file)
--- a/src/Container/Component_i.cxx
+++ b/src/Container/Component_i.cxx
@@ -759,7 +759,7 @@ bool Engines_Component_i::Killer( pthread_t ThreadId , int signum )
             }
           else
             {
-#ifdef WNT
+#ifdef WIN32
               MESSAGE("Killer : ThreadId " << ThreadId.p << " pthread_canceled") ;
 #else
               MESSAGE("Killer : ThreadId " << ThreadId << " pthread_canceled") ;
@@ -775,7 +775,7 @@ bool Engines_Component_i::Killer( pthread_t ThreadId , int signum )
             }
           else 
             {
-#ifdef WNT
+#ifdef WIN32
               MESSAGE("Killer : ThreadId " << ThreadId.p << " pthread_killed(" << signum << ")") ;
 #else
               MESSAGE("Killer : ThreadId " << ThreadId << " pthread_killed(" << signum << ")") ;

diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx
index f7bdd80ca4fe477344532dbec7b6c477675b4ca2..f5a66978c0e43d02ce11b5c10c765045f3e212e0 100644 (file)
--- a/src/Container/SALOME_ContainerManager.cxx
+++ b/src/Container/SALOME_ContainerManager.cxx
@@ -39,7 +39,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Session)
 
-#ifdef WNT
+#ifdef WIN32
 #include <process.h>
 #define getpid _getpid
 #endif
@@ -553,7 +553,7 @@ SALOME_ContainerManager::LaunchContainer(const Engines::ContainerParameters& par
     command = BuildCommandToLaunchRemoteContainer(resource_selected, params, container_exe);
 
   //redirect stdout and stderr in a file
-#ifdef WNT
+#ifdef WIN32
   std::string logFilename=getenv("TEMP");
   logFilename += "\\";
   std::string user = getenv( "USERNAME" );
@@ -577,7 +577,7 @@ SALOME_ContainerManager::LaunchContainer(const Engines::ContainerParameters& par
   logFilename += tmp.str();
   logFilename += ".log" ;
   command += " > " + logFilename + " 2>&1";
-#ifdef WNT
+#ifdef WIN32
   command = "%PYTHONBIN% -c \"import win32pm ; win32pm.spawnpid(r'" + command + "', '')\"";
 #else
   command += " &";

diff --git a/src/DSC/DSC_Basic/DSC_interface.cxx b/src/DSC/DSC_Basic/DSC_interface.cxx
index 05ae0545671631b24fe67b9a1f59804d1633b59b..3c2ab8b18be4a48720e90882625e3f5ccc157be5 100644 (file)
--- a/src/DSC/DSC_Basic/DSC_interface.cxx
+++ b/src/DSC/DSC_Basic/DSC_interface.cxx
@@ -26,7 +26,7 @@
 //
 #include <string>
 #include "DSC_interface.hxx"
-#ifdef WNT
+#ifdef WIN32
 #else
 #include <sys/time.h>
 #endif
@@ -437,7 +437,7 @@ static void initTrace(const std::string& containerName)
     {
       //trace in file
       traceType=1;
-#ifdef WNT
+#ifdef WIN32
       std::string logFilename=getenv("TEMP");
       logFilename += "\\";
 #else
@@ -503,7 +503,7 @@ void Engines_DSC_interface::writeEvent(const char* request,const std::string& co
     initTrace(containerName);
   if(traceLevel == 0)return;
 
-#ifdef WNT
+#ifdef WIN32
 #else
   struct timeval tv;
   gettimeofday(&tv,0);

diff --git a/src/GenericObj/SALOME_GenericObj_i.hh b/src/GenericObj/SALOME_GenericObj_i.hh
index d6fb13a197a00d11395b2d3f3623a7e9890d09f4..6b60971470a8b1766d12c7df9b334007ffc06e1c 100644 (file)
--- a/src/GenericObj/SALOME_GenericObj_i.hh
+++ b/src/GenericObj/SALOME_GenericObj_i.hh
@@ -40,7 +40,7 @@
 # define GENERICOBJ_EXPORT
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4275) // Disable warning interface non dll
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #endif

diff --git a/src/HDFPersist/HDFobject.cc b/src/HDFPersist/HDFobject.cc
index 455d06d950affaf2a38e9853921f1b474af307d2..805393f2d5478c43a989a7e2684390d7ecf07b9d 100644 (file)
--- a/src/HDFPersist/HDFobject.cc
+++ b/src/HDFPersist/HDFobject.cc
@@ -30,7 +30,7 @@
 #include <cstring>
 #include <stdlib.h>
 
-#ifdef WNT
+#ifdef WIN32
 #define strdup _strdup
 #endif
 

diff --git a/src/Launcher/Launcher_Job_Command.cxx b/src/Launcher/Launcher_Job_Command.cxx
index b623ff9f0864a438391bf9d7fb0225abf84df462..345a5ff74d6c0b92acb57929efba03d971da7dad 100644 (file)
--- a/src/Launcher/Launcher_Job_Command.cxx
+++ b/src/Launcher/Launcher_Job_Command.cxx
@@ -26,7 +26,7 @@
 #include <libbatch/Constants.hxx>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #include <io.h>
 #define _chmod chmod
 #endif

diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 52a7624afff780bae2de4d0d09597d2b56f81861..1f77000ae8a754ede0d6f1ee5e4dfdd97da188cf 100644 (file)
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -26,7 +26,7 @@
 #include <libbatch/Constants.hxx>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #include <io.h>
 #define _chmod chmod
 #endif

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index 3d525ae185babb7386bc11e437c07e4b0a3a077b..1ae97eef7d288eca7ef0fafd6e3429468cd1aa3a 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -596,7 +596,7 @@ void SALOME_LifeCycleCORBA::killOmniNames()
   std::string portNumber (::getenv ("NSPORT") );
   if ( !portNumber.empty() )
   {
-#ifdef WNT
+#ifdef WIN32
 #else
     std::string cmd ;
     cmd = std::string( "ps -eo pid,command | grep -v grep | grep -E \"omniNames.*")

diff --git a/src/LifeCycleCORBA/TestContainerManager.cxx b/src/LifeCycleCORBA/TestContainerManager.cxx
index 9ab3a266cbaf4c057e5da1d9b448d4eb05c5cb65..29f53bb5a40366bcd7fe7aaa5949fd4fc1fc7d03 100644 (file)
--- a/src/LifeCycleCORBA/TestContainerManager.cxx
+++ b/src/LifeCycleCORBA/TestContainerManager.cxx
@@ -25,7 +25,7 @@
 //
 #include "utilities.h"
 #include <iostream>
-#ifndef WNT
+#ifndef WIN32
 #include <unistd.h>
 #endif
 #include <SALOMEconfig.h>

diff --git a/src/Logger/SALOME_Logger_Server.hxx b/src/Logger/SALOME_Logger_Server.hxx
index 7c61a120031df6d21f537f465576fa76de75d59b..ce1cba5ef9834987e3bb186be95f60675b9ce59c 100644 (file)
--- a/src/Logger/SALOME_Logger_Server.hxx
+++ b/src/Logger/SALOME_Logger_Server.hxx
@@ -47,7 +47,7 @@
 # define LOGGER_EXPORT
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4275) // Disable warning interface non dll
 #endif
 

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
index f43258904591c1df57b785d11f80ad8ae9539480..9a2e6204ebedaeab81ac6c5cdd05f37151cbf21e 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx
@@ -35,7 +35,7 @@
 
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4275) // Disable warning interface non dll
 #pragma warning(disable:4290) // Warning Exception ...
 #endif

diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
index c142b9f064510eaf3d28936ad637f3250ef809b4..5cb11caf854b7176a2f8b81f76c68a494d30d3ef 100644 (file)
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx
@@ -39,7 +39,7 @@
 
 #include <libxml/parser.h>
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #endif
 

diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx
index 03ce58b31de1be81ddf1de77264b367ea4a78b02..3112749c8db47077306f5af01479bc6e6bf537fd 100644 (file)
--- a/src/NamingService/SALOME_NamingService.cxx
+++ b/src/NamingService/SALOME_NamingService.cxx
@@ -36,7 +36,7 @@
 #include <string>
 #include <cstdio>
 
-#ifdef WNT
+#ifdef WIN32
 #define strdup _strdup
 #endif
 

diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index f2168c235d224abd5c164bd2f8fd4790c34167f8..13b982facfe08cb999a41ad732ea95cf2c51dfaf 100644 (file)
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -41,7 +41,7 @@
 
 #include "SALOME_NamingService_defs.hxx"
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4290) // Warning Exception ...
 #endif
 

diff --git a/src/Notification/NOTIFICATION_Supplier.hxx b/src/Notification/NOTIFICATION_Supplier.hxx
index 1571a2788b313e3bfe4e9608339e3b90da56b301..3f34588e3f2d14f015bdf44b9077361eb5573758 100644 (file)
--- a/src/Notification/NOTIFICATION_Supplier.hxx
+++ b/src/Notification/NOTIFICATION_Supplier.hxx
@@ -30,7 +30,7 @@
 
 #include "SALOME_NOTIFICATION.hxx"
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4275) // Disable warning interface non dll
 #endif
 

diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx
index a15816843c29aacef48eac8799437f5041bc5353..e0e7130a396098c8c4d7873d7e60b035fe76aaed 100644 (file)
--- a/src/Registry/RegistryService.hxx
+++ b/src/Registry/RegistryService.hxx
@@ -36,7 +36,7 @@
 
 # include <map>
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4275) // Disable warning interface non dll
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #endif

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index 76db497f5dca6d69ad4407d882881132640a2ee0..b53ff16decd797321a5e4e52ba9980a3a224d916 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -31,7 +31,7 @@
 #include <list>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef WNT
+#ifdef WIN32
 #else
 #include <unistd.h>
 #endif

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index 6aeb378dc2511278df849242837fc2880a76fbe7..3fb147cf67682faf5339f53a54771f90524d9114 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -33,12 +33,12 @@
 #include "SALOME_LoadRateManager.hxx"
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef WNT
+#ifdef WIN32
 #else
 #include <unistd.h>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #pragma warning(disable:4290) // Warning Exception ...
 #endif

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 351d1e0c70a3cf9133ea7e55a70e15a7e1b10d02..8d41fb94708a991ef58c38400aab51d52f7dd1a8 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -37,7 +37,7 @@
 #include <map>
 #include <iostream>
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #endif
 

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx
index 619a1e705da39e4ddf9c70c42777831dcb772f0b..91afdd6a2654c56f645132e0fa1b38137dcfe9b7 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx
@@ -44,7 +44,7 @@
 # define SALOMERESOURCESMANAGER_EXPORT
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4275) // Disable warning interface non dll
 #endif
 

diff --git a/src/Utils/OpUtil.cxx b/src/Utils/OpUtil.cxx
index 323f0e87cd16b7dc6aaadfe1f8ed7e2b622c8f81..a7e121634d1a1f57d3c14ff0722af3c90fae4c50 100644 (file)
--- a/src/Utils/OpUtil.cxx
+++ b/src/Utils/OpUtil.cxx
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <string.h>
 
-#ifndef WNT
+#ifndef WIN32
 #include <unistd.h>
 #else
 #include <winsock2.h>

diff --git a/src/Utils/Utils_ORB_INIT.hxx b/src/Utils/Utils_ORB_INIT.hxx
index 1e35c03733da6450905f2bc42be6c82af253223d..26aff2f2e5aa2cb0b8286f25fa99a8b5604040ff 100644 (file)
--- a/src/Utils/Utils_ORB_INIT.hxx
+++ b/src/Utils/Utils_ORB_INIT.hxx
@@ -37,7 +37,7 @@
 
 #include "Utils_CommException.hxx"
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning(disable:4251) // Warning DLL Interface ...
 #pragma warning(disable:4290) // Warning Exception ...
 #endif