Replace deprecated WNT macro definition by WIN32.

diff --git a/src/AdvancedEngine/GEOM_AdvancedEngine.hxx b/src/AdvancedEngine/GEOM_AdvancedEngine.hxx
index ec1522503ee8c8a64b75e5f16e19207f8abf59c3..d378375355b8da5967b6e1d4542e3dd1307a8c26 100755 (executable)
--- a/src/AdvancedEngine/GEOM_AdvancedEngine.hxx
+++ b/src/AdvancedEngine/GEOM_AdvancedEngine.hxx
@@ -22,22 +22,14 @@
 #ifndef _GEOM_ADVANCEDENGINE_HXX_
 #define _GEOM_ADVANCEDENGINE_HXX_
 
-#ifdef WNT
+#ifdef WIN32
  #if defined ADVANCEDENGINE_EXPORTS || defined AdvancedEngine_EXPORTS
-  #if defined WIN32
    #define ADVANCEDENGINE_EXPORT __declspec( dllexport )
-  #else
-   #define ADVANCEDENGINE_EXPORT
-  #endif
  #else
-  #if defined WIN32
    #define ADVANCEDENGINE_EXPORT __declspec( dllimport )
-  #else
-   #define ADVANCEDENGINE_EXPORT
-  #endif
- #endif
+ #endif 
 #else
- #define ADVANCEDENGINE_EXPORT
+   #define ADVANCEDENGINE_EXPORT
 #endif
 
-#endif
+#endif
\ No newline at end of file

diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx
index 96d84c0b488d7fd0195210541d60ae875108a146..3a49b678092760f175cfef41bc62400060c0a7e9 100644 (file)
--- a/src/BREPExport/BREPExport.cxx
+++ b/src/BREPExport/BREPExport.cxx
@@ -32,22 +32,14 @@
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
-#ifdef WNT
- #if defined BREPEXPORT_EXPORTS || defined BREPExport_EXPORTS
-  #if defined WIN32
-   #define BREPEXPORT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined BREPEXPORT_EXPORTS || defined BREPExport_EXPORTS
+    #define BREPEXPORT_EXPORT __declspec( dllexport )
   #else
-   #define BREPEXPORT_EXPORT
+    #define BREPEXPORT_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define BREPEXPORT_EXPORT __declspec( dllimport )
-  #else
-   #define BREPEXPORT_EXPORT
-  #endif
- #endif
 #else
- #define BREPEXPORT_EXPORT
+   #define BREPEXPORT_EXPORT
 #endif
 
 //=============================================================================

diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx
index 7064f3c130ea921cbf3d10a92a29cdb1b74aef85..06665baed7f2011076a246e0ccb109f6fa523cab 100644 (file)
--- a/src/BREPImport/BREPImport.cxx
+++ b/src/BREPImport/BREPImport.cxx
@@ -34,22 +34,14 @@
 #include <TopoDS_Shape.hxx>
 #include <TDF_Label.hxx>
 
-#ifdef WNT
- #if defined BREPIMPORT_EXPORTS || defined BREPImport_EXPORTS
-  #if defined WIN32
-   #define BREPIMPORT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined BREPIMPORT_EXPORTS || defined BREPImport_EXPORTS
+    #define BREPIMPORT_EXPORT __declspec( dllexport )
   #else
-   #define BREPIMPORT_EXPORT
+    #define BREPIMPORT_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define BREPIMPORT_EXPORT __declspec( dllimport )
-  #else
-   #define BREPIMPORT_EXPORT
-  #endif
- #endif
 #else
- #define BREPIMPORT_EXPORT
+  #define BREPIMPORT_EXPORT
 #endif
 
 //=============================================================================

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 99e94148f43b51f59759b31aba7c535be0c5f547..581c7d961f58fa17897b7b63ba8ff6095de9c3a4 100644 (file)
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx
index 3dbbb8788dcc73b99dfe28d9578572a6cd0e8d03..2b8a2470fb428b3b201734f5430de921b5880d8c 100755 (executable)
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx
@@ -32,7 +32,7 @@
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable : 4101)
 #endif
 

diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index b2104d683e0860617e1bdcb9b840200e0c26edf4..8f7bde8b95fa9661dc946e5ea08558a8f4348286 100644 (file)
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -44,7 +44,7 @@
 #include <TopAbs.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#ifdef WNT
+#ifdef WIN32
 #include <process.h>
 #else
 #include <unistd.h>
@@ -91,7 +91,7 @@ TopoDS_Shape GEOM_Client::Load( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr a
 GEOM_Client::GEOM_Client()
 {
   pid_client =
-#ifdef WNT
+#ifdef WIN32
     (long)_getpid();
 #else
     (long)getpid();

diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx
index 9c74d00a1a151270bbeee4a8c8e9d11a62e13413..b7284b9e63e39090fee7341793044f1afa9be20b 100644 (file)
--- a/src/GEOMClient/GEOM_Client.hxx
+++ b/src/GEOMClient/GEOM_Client.hxx
@@ -52,22 +52,14 @@ class TopoDS_Shape;
 #include <Standard_Macro.hxx>
 #endif
 
-#ifdef WNT
- #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
-  #if defined WIN32
-   #define GEOMCLIENT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
+    #define GEOMCLIENT_EXPORT __declspec( dllexport )
   #else
-   #define GEOMCLIENT_EXPORT
+    #define GEOMCLIENT_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define GEOMCLIENT_EXPORT __declspec( dllimport )
-  #else
-   #define GEOMCLIENT_EXPORT
-  #endif
- #endif
 #else
- #define GEOMCLIENT_EXPORT
+   #define GEOMCLIENT_EXPORT
 #endif
 
 #include <TCollection_AsciiString.hxx>

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 85242c95997ff289da880ea88a3aaaae26b652f8..2e88829e7779a47822a2a65153ecc9720cbbf54d 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -247,7 +247,7 @@ GEOMGUI* GeometryGUI::getLibrary( const QString& libraryName )
 {
   if ( !myGUIMap.contains( libraryName ) ) {
     // try to load library if it is not loaded yet
-#ifndef WNT
+#ifndef WIN32
     QString dirs = getenv( "LD_LIBRARY_PATH" );
     QString sep  = ":";
 #else
@@ -291,7 +291,7 @@ GEOMPluginGUI* GeometryGUI::getPluginLibrary( const QString& libraryName )
 {
   if ( !myGUIMap.contains( libraryName ) ) {
     // try to load library if it is not loaded yet
-#ifndef WNT
+#ifndef WIN32
     QString dirs = getenv( "LD_LIBRARY_PATH" );
     QString sep  = ":";
 #else
@@ -663,7 +663,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam )
 
       GEOMPluginGUI* library = 0;
       if ( !libName.isEmpty() ) {
-#ifndef WNT
+#ifndef WIN32
         libName = QString( "lib" ) + libName + ".so";
 #else
         libName = libName + ".dll";
@@ -692,7 +692,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam )
 
   GEOMGUI* library = 0;
   if ( !libName.isEmpty() ) {
-#ifndef WNT
+#ifndef WIN32
     libName = QString( "lib" ) + libName + ".so";
 #else
     libName = libName + ".dll";

diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx
index 618bcdee40f8fcdc5537ba87fb82ce42b86893fa..0cf71765154022fea6ea78ee604f355588836405 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx
@@ -32,13 +32,13 @@
 
 #include <Standard_Failure.hxx>
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #else
 #include <dlfcn.h>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #define LibHandle HMODULE
 #define LoadLib( name ) LoadLibrary( name )
 #define GetProc GetProcAddress

diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx
index cf903776af47c16d869b9addf2a0394fad2d3572..c3dc9422c1fe7423735f2885e3c7166f89f84c35 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_Gen.cxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index 6d1c2d83ff1c058bbcb0c65a25dc63f5651dba7c..b08d2b829e9ca7b2a275092da4ffd3f6fb3900f5 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
index 9934610e31e3e0b62d99c3fba8c0475802cf53cd..c679b048a2f526d2aa1d624c261d926e4fd8d145 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...

diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index 42924e3baa9aa06059916b1d769116312545d8bb..8b2067e87cee4174231e5a743d6d7bb84c34f402 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 311e43eb1e20aa913322fbbf7bf524a46dc184e5..0e2ad239f6519def92cf24ab8593d3eede363f12 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -514,7 +514,7 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
       aKey += aMode;
       if (myResMgr->Find(aKey.ToCString())) {
         TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString()));        
-#ifndef WNT
+#ifndef WIN32
         aLibName += ".so";     
 #else
         aLibName += ".dll";
@@ -559,7 +559,7 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
     // Initialize the Resource Manager
     TCollection_AsciiString aNull;
     aResDir = TCollection_AsciiString(getenv("GEOM_ROOT_DIR"));
-#ifdef WNT
+#ifdef WIN32
     aResDir += "\\share\\salome\\resources\\geom";
 #else
     aResDir += "/share/salome/resources/geom";
@@ -586,7 +586,7 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
     else
     {
       aUserResDir = getenv("HOME");
-#ifdef WNT
+#ifdef WIN32
       aUserResDir += "\\.salome\\resources";
 #else
       aUserResDir += "/.salome/resources";

diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
index 16a8b8ce539ca79a3de8a3d73aa9ee5954706a3f..145364459e16fb03e5b17f42e277bb466f3418d4 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
@@ -36,13 +36,13 @@
 #include <Standard_Failure.hxx>
 #include <StdFail_NotDone.hxx>
 
-#ifdef WNT
+#ifdef WIN32
 #include <windows.h>
 #else
 #include <dlfcn.h>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #define LibHandle HMODULE
 #define LoadLib( name ) LoadLibrary( name )
 #define GetProc GetProcAddress

diff --git a/src/GEOMImpl/GEOM_GEOMImpl.hxx b/src/GEOMImpl/GEOM_GEOMImpl.hxx
index 7e277ede49b82c59cb10dcb4de3e5f9c40c8b685..4dbfc0ef65417d2eb2b0668b19ac22a808eb8ddb 100755 (executable)
--- a/src/GEOMImpl/GEOM_GEOMImpl.hxx
+++ b/src/GEOMImpl/GEOM_GEOMImpl.hxx
@@ -27,22 +27,14 @@
 #ifndef _GEOM_GEOMImpl_HXX_
 #define _GEOM_GEOMImpl_HXX_
 
-#ifdef WNT
- #if defined GEOMIMPL_EXPORTS || defined GEOMImpl_EXPORTS
-  #if defined WIN32
-   #define GEOMIMPL_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined GEOMIMPL_EXPORTS || defined GEOMImpl_EXPORTS
+    #define GEOMIMPL_EXPORT __declspec( dllexport )
   #else
-   #define GEOMIMPL_EXPORT
+    #define GEOMIMPL_EXPORT __declspec( dllimport )
   #endif
  #else
-  #if defined WIN32
-   #define GEOMIMPL_EXPORT __declspec( dllimport )
-  #else
-   #define GEOMIMPL_EXPORT
-  #endif
- #endif
-#else
- #define GEOMIMPL_EXPORT
+    #define GEOMIMPL_EXPORT
 #endif
 
 #endif

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index 5ec94e274025429b1c2a385ba4d008f24b9f9cbb..ff12a18b5c814a00311791504e89358b860ed346 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@@ -172,7 +172,7 @@ void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
     myTypeGroup->button( 0 )->setChecked( true );
     myWGStack->setCurrentIndex( 0 );
     myStdTypeCombo->setCurrentIndex( (int)type - 1 );
-#ifdef WNT
+#ifdef WIN32
     int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) );
 #else
     int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) );

diff --git a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
index 8924196807cff4322754db427dd945659f810a38..1f910369d14c5972a4efb9b8e534950ca8ece938 100755 (executable)
--- a/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
+++ b/src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
@@ -27,22 +27,14 @@
 #ifndef _GEOM_ToolsGUI_HXX_
 #define _GEOM_ToolsGUI_HXX_
 
-#ifdef WNT
- #if defined GEOMTOOLSGUI_EXPORTS || defined GEOMToolsGUI_EXPORTS
-  #if defined WIN32
-   #define GEOMTOOLSGUI_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined GEOMTOOLSGUI_EXPORTS || defined GEOMToolsGUI_EXPORTS
+    #define GEOMTOOLSGUI_EXPORT __declspec( dllexport )
   #else
-   #define GEOMTOOLSGUI_EXPORT
+    #define GEOMTOOLSGUI_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define GEOMTOOLSGUI_EXPORT __declspec( dllimport )
-  #else
-   #define GEOMTOOLSGUI_EXPORT
-  #endif
- #endif
 #else
- #define GEOMTOOLSGUI_EXPORT
+  #define GEOMTOOLSGUI_EXPORT
 #endif
 
-#endif
+#endif //_GEOM_ToolsGUI_HXX_

diff --git a/src/GEOM_I/GEOM_BaseObject_i.cc b/src/GEOM_I/GEOM_BaseObject_i.cc
index 53558052370b6fec06f3a6cf6f30502ef28735f3..dd5db5eeb0db5408a5f346b5bffa40db25e885b1 100644 (file)
--- a/src/GEOM_I/GEOM_BaseObject_i.cc
+++ b/src/GEOM_I/GEOM_BaseObject_i.cc
@@ -39,7 +39,7 @@
 #include <typeinfo>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc
index 627466690475af7e529f1dde3941825414cd678b..40a9ad679b1a3836fe6e71455ca7d619fdf5b1f8 100644 (file)
--- a/src/GEOM_I/GEOM_DumpPython.cc
+++ b/src/GEOM_I/GEOM_DumpPython.cc
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOM_I/GEOM_Field_i.cc b/src/GEOM_I/GEOM_Field_i.cc
index 79cdcde1147fb1c4a7518de4cb609c377cd111c2..b16df7e67e0781e5ce1f39a0021d704d93323f8f 100644 (file)
--- a/src/GEOM_I/GEOM_Field_i.cc
+++ b/src/GEOM_I/GEOM_Field_i.cc
@@ -27,7 +27,7 @@
 #include <TCollection_ExtendedString.hxx>
 #include <TColStd_HArray1OfReal.hxx>
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOM_I/GEOM_GEOM_I.hxx b/src/GEOM_I/GEOM_GEOM_I.hxx
index f1477c9d420c7c90ba77d149d08af2a66569081e..8935bb6a4779ce56ceb5064d81dae9a6fe83046a 100755 (executable)
--- a/src/GEOM_I/GEOM_GEOM_I.hxx
+++ b/src/GEOM_I/GEOM_GEOM_I.hxx
@@ -27,22 +27,14 @@
 #ifndef _GEOM_GEOM_I_HXX_
 #define _GEOM_GEOM_I_HXX_
 
-#ifdef WNT
- #if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS
-  #if defined WIN32
-   #define GEOM_I_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS
+    #define GEOM_I_EXPORT __declspec( dllexport )
   #else
-   #define GEOM_I_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define GEOM_I_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_I_EXPORT
+    #define GEOM_I_EXPORT __declspec( dllimport )
   #endif
- #endif
 #else
- #define GEOM_I_EXPORT
+   #define GEOM_I_EXPORT
 #endif
 
-#endif
+#endif //_GEOM_GEOM_I_HXX_

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index 171540f3cb1906903289132df61c5027359b5e4b..29aa20836c0374efe59aa532bbc6e0e2697d93dc 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -19,7 +19,7 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 
@@ -66,14 +66,14 @@
 #include <set>
 #include <sstream>
 
-#ifdef WNT
+#ifdef WIN32
  #include <windows.h>
  #include <process.h>
 #else
  #include <dlfcn.h>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
  #define LibHandle HMODULE
  #define LoadLib( name ) LoadLibrary( name )
  #define GetProc GetProcAddress
@@ -553,7 +553,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
   // OCCT BUG: cannot save a document (in current folder)
   // if directory name is empty
   if (aTmpDir.size() == 0) {
-#ifdef WNT
+#ifdef WIN32
     aTmpDir = ".\\";
 #else
     aTmpDir = "./";
@@ -616,7 +616,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
   // OCCT BUG: cannot load a document (from current folder)
   // if directory name is empty
   if (aTmpDir.size() == 0) {
-#ifdef WNT
+#ifdef WIN32
     aTmpDir = ".\\";
 #else
     aTmpDir = "./";
@@ -2403,7 +2403,7 @@ GEOM::GEOM_IOperations_ptr GEOM_Gen_i::GetPluginOperations(CORBA::Long theStudyI
      throw ( SALOME::SALOME_Exception )
 {
   std::string aPlatformLibName;
-#ifdef WNT
+#ifdef WIN32
   aPlatformLibName = theLibName;
   aPlatformLibName += ".dll" ;
 #else
@@ -2427,7 +2427,7 @@ GEOM::GEOM_IOperations_ptr GEOM_Gen_i::GetPluginOperations(CORBA::Long theStudyI
       LibHandle libHandle = LoadLib( aPlatformLibName.c_str()/*theLibName*/ );
       if (!libHandle) {
         // report any error, if occured
-#ifndef WNT
+#ifndef WIN32
         const char* anError = dlerror();
         throw(SALOME_Exception(anError));
 #else

diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index 6e68699cde1b42cbbbe93ddfdd7eb1a09032852f..d4818618fdd4b452ee77b6bcd047931995814212 100644 (file)
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index efa602ef7677a31e24b71e53af995d8cad949aef..16731b97ac41289da26c2eb2c54b5a15d7783ad1 100644 (file)
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -49,7 +49,7 @@
 #include <typeinfo>
 #endif
 
-#ifdef WNT
+#ifdef WIN32
 #pragma warning( disable:4786 )
 #endif
 

diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx
index 00371ec5ba1dd684ae72c44c175700e4b129ee4c..64f84e2f7f523593b4f5fe128cb8fec6f7a23e63 100644 (file)
--- a/src/IGESExport/IGESExport.cxx
+++ b/src/IGESExport/IGESExport.cxx
@@ -39,22 +39,14 @@
 
 #include <Standard_Failure.hxx>
 
-#ifdef WNT
- #if defined IGESEXPORT_EXPORTS || defined IGESExport_EXPORTS
-  #if defined WIN32
-   #define IGESEXPORT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined IGESEXPORT_EXPORTS || defined IGESExport_EXPORTS
+    #define IGESEXPORT_EXPORT __declspec( dllexport )
   #else
-   #define IGESEXPORT_EXPORT
+    #define IGESEXPORT_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define IGESEXPORT_EXPORT __declspec( dllimport )
-  #else
-   #define IGESEXPORT_EXPORT
-  #endif
- #endif
 #else
- #define IGESEXPORT_EXPORT
+  #define IGESEXPORT_EXPORT
 #endif
 
 //=============================================================================

diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx
index 94d77caf9c43628a07eaba0d5a0b884a509401fc..279c3d346e176d2d58d4a210d1b744067f4f08d7 100644 (file)
--- a/src/IGESImport/IGESImport.cxx
+++ b/src/IGESImport/IGESImport.cxx
@@ -53,22 +53,14 @@
 
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
-#ifdef WNT
- #if defined IGESIMPORT_EXPORTS || defined IGESImport_EXPORTS
-  #if defined WIN32
-   #define IGESIMPORT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined IGESIMPORT_EXPORTS || defined IGESImport_EXPORTS
+    #define IGESIMPORT_EXPORT __declspec( dllexport )
   #else
-   #define IGESIMPORT_EXPORT
+    #define IGESIMPORT_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define IGESIMPORT_EXPORT __declspec( dllimport )
-  #else
-   #define IGESIMPORT_EXPORT
-  #endif
- #endif
 #else
- #define IGESIMPORT_EXPORT
+  #define IGESIMPORT_EXPORT
 #endif
 
 //=============================================================================

diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx
index edf5edc804e53956f1453bc5e7481c41d00ece51..84a1c427c97902a7e92a800569a0fa8e346a3262 100644 (file)
--- a/src/OperationGUI/OperationGUI.cxx
+++ b/src/OperationGUI/OperationGUI.cxx
@@ -98,7 +98,7 @@ bool OperationGUI::OnGUIEvent (int theCommandID, SUIT_Desktop* parent)
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
+#ifdef WIN32
   __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )

diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx
index 860459574772341f93ef98db8afc9d10d10c8ae0..93738d154f7b8c0bd46d0620dc837e7517312f02 100644 (file)
--- a/src/RepairGUI/RepairGUI.cxx
+++ b/src/RepairGUI/RepairGUI.cxx
@@ -113,7 +113,7 @@ bool RepairGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
+#ifdef WIN32
   __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )

diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx
index e5fd0e444ca2b6081516a057dce945b12322fe4d..b0f0d68c30180fb1f8e9b6fd7d9a2c5ea8bd6bf0 100644 (file)
--- a/src/STEPExport/STEPExport.cxx
+++ b/src/STEPExport/STEPExport.cxx
@@ -36,22 +36,14 @@
 #include <TCollection_AsciiString.hxx>
 #include <TopoDS_Shape.hxx>
 
-#ifdef WNT
- #if defined STEPEXPORT_EXPORTS || defined STEPExport_EXPORTS
-  #if defined WIN32
-   #define STEPEXPORT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined STEPEXPORT_EXPORTS || defined STEPExport_EXPORTS
+    #define STEPEXPORT_EXPORT __declspec( dllexport )
   #else
-   #define STEPEXPORT_EXPORT
+    #define STEPEXPORT_EXPORT __declspec( dllimport )     
   #endif
- #else
-  #if defined WIN32
-   #define STEPEXPORT_EXPORT __declspec( dllimport )
-  #else
-   #define STEPEXPORT_EXPORT
-  #endif
- #endif
 #else
- #define STEPEXPORT_EXPORT
+  #define STEPEXPORT_EXPORT
 #endif
 
 //=============================================================================

diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index 04d5d72db74af10593ab2c4c236820f87791e20b..1bc12a79a8cc530f5530117b2a554c88ac34f2ea 100644 (file)
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -65,22 +65,14 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
-#ifdef WNT
- #if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS
-  #if defined WIN32
-   #define STEPIMPORT_EXPORT __declspec( dllexport )
+#ifdef WIN32
+  #if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS
+    #define STEPIMPORT_EXPORT __declspec( dllexport )
   #else
-   #define STEPIMPORT_EXPORT
+    #define STEPIMPORT_EXPORT __declspec( dllimport )
   #endif
- #else
-  #if defined WIN32
-   #define STEPIMPORT_EXPORT __declspec( dllimport )
-  #else
-   #define STEPIMPORT_EXPORT
-  #endif
- #endif
 #else
- #define STEPIMPORT_EXPORT
+  #define STEPIMPORT_EXPORT
 #endif
 
 //=============================================================================

diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index e4e4071b645f17c6c0162bd0e2b701ecc6495d1a..96d06621d4c01a8074c9aa9ed305d623fb8d1e32 100644 (file)
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.cxx
@@ -168,7 +168,7 @@ bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
 //=====================================================================================
 extern "C"
 {
-#ifdef WNT
+#ifdef WIN32
   __declspec( dllexport )
 #endif
   GEOMGUI* GetLibGUI( GeometryGUI* parent )