Replace deprecated WNT macro definition by WIN32.

2025-01-25 01:30:32 +05:00 · 2013-10-17 14:53:21 +00:00 · 2013-10-17 14:53:21 +00:00 · 874aceefb0
commit 874aceefb0
parent b3e0432875
32 changed files with 91 additions and 179 deletions
--- 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
--- 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

 //=============================================================================
--- 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

 //=============================================================================
--- 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

--- 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

--- 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();
--- 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>
--- 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";
--- 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
--- 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

--- 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

--- 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, ...
--- 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

--- 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";
--- 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
--- 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
--- 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 ) );
--- 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_
--- 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

--- 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

--- 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

--- 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
+    #define GEOM_I_EXPORT __declspec( dllimport )
  #endif
- #else
-  #if defined WIN32
-   #define GEOM_I_EXPORT __declspec( dllimport )
-  #else
-   #define GEOM_I_EXPORT
-  #endif
- #endif
 #else
- #define GEOM_I_EXPORT
+   #define GEOM_I_EXPORT
 #endif

-#endif
+#endif //_GEOM_GEOM_I_HXX_
--- 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
--- 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

--- 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

--- 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

 //=============================================================================
--- 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

 //=============================================================================
--- 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 )
--- 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 )
--- 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

 //=============================================================================
--- 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

 //=============================================================================
--- 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 )