From 874aceefb02eadebc06684071882db16d561e1fd Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 17 Oct 2013 14:53:21 +0000 Subject: [PATCH] Replace deprecated WNT macro definition by WIN32. --- src/AdvancedEngine/GEOM_AdvancedEngine.hxx | 16 ++++------------ src/BREPExport/BREPExport.cxx | 18 +++++------------- src/BREPImport/BREPImport.cxx | 18 +++++------------- src/GEOM/GEOM_Engine.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKey.cxx | 2 +- src/GEOMClient/GEOM_Client.cxx | 4 ++-- src/GEOMClient/GEOM_Client.hxx | 18 +++++------------- src/GEOMGUI/GeometryGUI.cxx | 8 ++++---- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 4 ++-- src/GEOMImpl/GEOMImpl_Gen.cxx | 2 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 6 +++--- src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 4 ++-- src/GEOMImpl/GEOM_GEOMImpl.hxx | 18 +++++------------- src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx | 2 +- src/GEOMToolsGUI/GEOM_ToolsGUI.hxx | 20 ++++++-------------- src/GEOM_I/GEOM_BaseObject_i.cc | 2 +- src/GEOM_I/GEOM_DumpPython.cc | 2 +- src/GEOM_I/GEOM_Field_i.cc | 2 +- src/GEOM_I/GEOM_GEOM_I.hxx | 20 ++++++-------------- src/GEOM_I/GEOM_Gen_i.cc | 14 +++++++------- src/GEOM_I/GEOM_IInsertOperations_i.cc | 2 +- src/GEOM_I/GEOM_Object_i.cc | 2 +- src/IGESExport/IGESExport.cxx | 18 +++++------------- src/IGESImport/IGESImport.cxx | 18 +++++------------- src/OperationGUI/OperationGUI.cxx | 2 +- src/RepairGUI/RepairGUI.cxx | 2 +- src/STEPExport/STEPExport.cxx | 18 +++++------------- src/STEPImport/STEPImport.cxx | 18 +++++------------- src/TransformationGUI/TransformationGUI.cxx | 2 +- 32 files changed, 91 insertions(+), 179 deletions(-) diff --git a/src/AdvancedEngine/GEOM_AdvancedEngine.hxx b/src/AdvancedEngine/GEOM_AdvancedEngine.hxx index ec1522503..d37837535 100755 --- 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 96d84c0b4..3a49b6780 100644 --- a/src/BREPExport/BREPExport.cxx +++ b/src/BREPExport/BREPExport.cxx @@ -32,22 +32,14 @@ #include #include -#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 7064f3c13..06665baed 100644 --- a/src/BREPImport/BREPImport.cxx +++ b/src/BREPImport/BREPImport.cxx @@ -34,22 +34,14 @@ #include #include -#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 99e94148f..581c7d961 100644 --- 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 3dbbb8788..2b8a2470f 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx @@ -32,7 +32,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #pragma warning( disable : 4101) #endif diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index b2104d683..8f7bde8b9 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -44,7 +44,7 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #else #include @@ -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 9c74d00a1..b7284b9e6 100644 --- a/src/GEOMClient/GEOM_Client.hxx +++ b/src/GEOMClient/GEOM_Client.hxx @@ -52,22 +52,14 @@ class TopoDS_Shape; #include #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 diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 85242c959..2e88829e7 100644 --- 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 618bcdee4..0cf717651 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -32,13 +32,13 @@ #include -#ifdef WNT +#ifdef WIN32 #include #else #include #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 cf903776a..c3dc9422c 100644 --- 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 6d1c2d83f..b08d2b829 100644 --- 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 9934610e3..c679b048a 100644 --- 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 42924e3ba..8b2067e87 100644 --- 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 311e43eb1..0e2ad239f 100644 --- 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 16a8b8ce5..145364459 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -36,13 +36,13 @@ #include #include -#ifdef WNT +#ifdef WIN32 #include #else #include #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 7e277ede4..4dbfc0ef6 100755 --- 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 5ec94e274..ff12a18b5 100644 --- 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 892419680..1f910369d 100755 --- 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 535580523..dd5db5eeb 100644 --- a/src/GEOM_I/GEOM_BaseObject_i.cc +++ b/src/GEOM_I/GEOM_BaseObject_i.cc @@ -39,7 +39,7 @@ #include #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 627466690..40a9ad679 100644 --- 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 79cdcde11..b16df7e67 100644 --- a/src/GEOM_I/GEOM_Field_i.cc +++ b/src/GEOM_I/GEOM_Field_i.cc @@ -27,7 +27,7 @@ #include #include -#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 f1477c9d4..8935bb6a4 100755 --- 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 171540f3c..29aa20836 100644 --- 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 #include -#ifdef WNT +#ifdef WIN32 #include #include #else #include #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 6e68699cd..d4818618f 100644 --- 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 efa602ef7..16731b97a 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -49,7 +49,7 @@ #include #endif -#ifdef WNT +#ifdef WIN32 #pragma warning( disable:4786 ) #endif diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx index 00371ec5b..64f84e2f7 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -39,22 +39,14 @@ #include -#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 94d77caf9..279c3d346 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -53,22 +53,14 @@ #include // 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 edf5edc80..84a1c427c 100644 --- 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 860459574..93738d154 100644 --- 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 e5fd0e444..b0f0d68c3 100644 --- a/src/STEPExport/STEPExport.cxx +++ b/src/STEPExport/STEPExport.cxx @@ -36,22 +36,14 @@ #include #include -#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 04d5d72db..1bc12a79a 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -65,22 +65,14 @@ #include #include // 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 e4e4071b6..96d06621d 100644 --- 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 ) -- 2.39.2