From b71f00a6d7bb60f087c0a9cc0e83ea6566cdeb8c Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Thu, 17 Oct 2013 14:27:47 +0000
Subject: [PATCH] Replace deprecated WNT macro definition by WIN32.

---
 src/Basics/BasicsGenericDestructor.hxx                     | 2 +-
 src/Container/Component_i.cxx                              | 4 ++--
 src/Container/SALOME_ContainerManager.cxx                  | 6 +++---
 src/DSC/DSC_Basic/DSC_interface.cxx                        | 6 +++---
 src/GenericObj/SALOME_GenericObj_i.hh                      | 2 +-
 src/HDFPersist/HDFobject.cc                                | 2 +-
 src/Launcher/Launcher_Job_Command.cxx                      | 2 +-
 src/Launcher/Launcher_Job_SALOME.cxx                       | 2 +-
 src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx               | 2 +-
 src/LifeCycleCORBA/TestContainerManager.cxx                | 2 +-
 src/Logger/SALOME_Logger_Server.hxx                        | 2 +-
 src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx | 2 +-
 src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx         | 2 +-
 src/NamingService/SALOME_NamingService.cxx                 | 2 +-
 src/NamingService/SALOME_NamingService.hxx                 | 2 +-
 src/Notification/NOTIFICATION_Supplier.hxx                 | 2 +-
 src/Registry/RegistryService.hxx                           | 2 +-
 src/ResourcesManager/ResourcesManager.cxx                  | 2 +-
 src/ResourcesManager/ResourcesManager.hxx                  | 4 ++--
 src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx    | 2 +-
 src/ResourcesManager/SALOME_ResourcesManager.hxx           | 2 +-
 src/Utils/OpUtil.cxx                                       | 2 +-
 src/Utils/Utils_ORB_INIT.hxx                               | 2 +-
 23 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/Basics/BasicsGenericDestructor.hxx b/src/Basics/BasicsGenericDestructor.hxx
index 49053d3c6..22b645de7 100644
--- 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 50a6a90f9..454d82198 100644
--- 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 f7bdd80ca..f5a66978c 100644
--- 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 05ae05456..3c2ab8b18 100644
--- 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 d6fb13a19..6b6097147 100644
--- 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 455d06d95..805393f2d 100644
--- 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 b623ff9f0..345a5ff74 100644
--- 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 52a7624af..1f77000ae 100644
--- 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 3d525ae18..1ae97eef7 100644
--- 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 9ab3a266c..29f53bb5a 100644
--- 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 7c61a1200..ce1cba5ef 100644
--- 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 f43258904..9a2e6204e 100644
--- 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 c142b9f06..5cb11caf8 100644
--- 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 03ce58b31..3112749c8 100644
--- 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 f2168c235..13b982fac 100644
--- 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 1571a2788..3f34588e3 100644
--- 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 a15816843..e0e7130a3 100644
--- 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 76db497f5..b53ff16de 100644
--- 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 6aeb378dc..3fb147cf6 100644
--- 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 351d1e0c7..8d41fb947 100755
--- 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 619a1e705..91afdd6a2 100644
--- 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 323f0e87c..a7e121634 100644
--- 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 1e35c0373..26aff2f2e 100644
--- 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
-- 
2.39.2