ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-04 01:20:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated WNT macro definition by WIN32.

Browse Source
This commit is contained in:
rnv 2013-10-17 14:53:21 +00:00
parent b3e0432875
commit 874aceefb0
32 changed files with 91 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/AdvancedEngine/GEOM_AdvancedEngine.hxx
View File

@ -22,22 +22,14 @@
#ifndef _GEOM_ADVANCEDENGINE_HXX_ #ifndef _GEOM_ADVANCEDENGINE_HXX_
#define _GEOM_ADVANCEDENGINE_HXX_ #define _GEOM_ADVANCEDENGINE_HXX_
#ifdef WNT #ifdef WIN32
#if defined ADVANCEDENGINE_EXPORTS || defined AdvancedEngine_EXPORTS #if defined ADVANCEDENGINE_EXPORTS || defined AdvancedEngine_EXPORTS
#if defined WIN32
#define ADVANCEDENGINE_EXPORT __declspec( dllexport ) #define ADVANCEDENGINE_EXPORT __declspec( dllexport )
#else
#define ADVANCEDENGINE_EXPORT
#endif
#else #else
#if defined WIN32
#define ADVANCEDENGINE_EXPORT __declspec( dllimport ) #define ADVANCEDENGINE_EXPORT __declspec( dllimport )
#else #endif
#define ADVANCEDENGINE_EXPORT
#endif
#endif
#else #else
#define ADVANCEDENGINE_EXPORT #define ADVANCEDENGINE_EXPORT
#endif #endif
#endif #endif

18
src/BREPExport/BREPExport.cxx
View File

@ -32,22 +32,14 @@
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#ifdef WNT #ifdef WIN32
#if defined BREPEXPORT_EXPORTS || defined BREPExport_EXPORTS #if defined BREPEXPORT_EXPORTS || defined BREPExport_EXPORTS
#if defined WIN32 #define BREPEXPORT_EXPORT __declspec( dllexport )
#define BREPEXPORT_EXPORT __declspec( dllexport )
#else #else
#define BREPEXPORT_EXPORT #define BREPEXPORT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define BREPEXPORT_EXPORT __declspec( dllimport )
#else
#define BREPEXPORT_EXPORT
#endif
#endif
#else #else
#define BREPEXPORT_EXPORT #define BREPEXPORT_EXPORT
#endif #endif
//============================================================================= //=============================================================================

18
src/BREPImport/BREPImport.cxx
View File

@ -34,22 +34,14 @@
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#include <TDF_Label.hxx> #include <TDF_Label.hxx>
#ifdef WNT #ifdef WIN32
#if defined BREPIMPORT_EXPORTS || defined BREPImport_EXPORTS #if defined BREPIMPORT_EXPORTS || defined BREPImport_EXPORTS
#if defined WIN32 #define BREPIMPORT_EXPORT __declspec( dllexport )
#define BREPIMPORT_EXPORT __declspec( dllexport )
#else #else
#define BREPIMPORT_EXPORT #define BREPIMPORT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define BREPIMPORT_EXPORT __declspec( dllimport )
#else
#define BREPIMPORT_EXPORT
#endif
#endif
#else #else
#define BREPIMPORT_EXPORT #define BREPIMPORT_EXPORT
#endif #endif
//============================================================================= //=============================================================================

2
src/GEOM/GEOM_Engine.cxx
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

2
src/GEOMAlgo/GEOMAlgo_PassKey.cxx
View File

@ -32,7 +32,7 @@
#include <TColStd_ListIteratorOfListOfInteger.hxx> #include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <TColStd_ListOfInteger.hxx> #include <TColStd_ListOfInteger.hxx>
#ifdef WNT #ifdef WIN32
#pragma warning( disable : 4101) #pragma warning( disable : 4101)
#endif #endif

4
src/GEOMClient/GEOM_Client.cxx
View File

@ -44,7 +44,7 @@
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TopTools_IndexedMapOfShape.hxx> #include <TopTools_IndexedMapOfShape.hxx>
#ifdef WNT #ifdef WIN32
#include <process.h> #include <process.h>
#else #else
#include <unistd.h> #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() GEOM_Client::GEOM_Client()
{ {
pid_client = pid_client =
#ifdef WNT #ifdef WIN32
(long)_getpid(); (long)_getpid();
#else #else
(long)getpid(); (long)getpid();

18
src/GEOMClient/GEOM_Client.hxx
View File

@ -52,22 +52,14 @@ class TopoDS_Shape;
#include <Standard_Macro.hxx> #include <Standard_Macro.hxx>
#endif #endif
#ifdef WNT #ifdef WIN32
#if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS #if defined GEOMCLIENT_EXPORTS || defined GEOMClient_EXPORTS
#if defined WIN32 #define GEOMCLIENT_EXPORT __declspec( dllexport )
#define GEOMCLIENT_EXPORT __declspec( dllexport )
#else #else
#define GEOMCLIENT_EXPORT #define GEOMCLIENT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define GEOMCLIENT_EXPORT __declspec( dllimport )
#else
#define GEOMCLIENT_EXPORT
#endif
#endif
#else #else
#define GEOMCLIENT_EXPORT #define GEOMCLIENT_EXPORT
#endif #endif
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>

8
src/GEOMGUI/GeometryGUI.cxx
View File

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

4
src/GEOMImpl/GEOMImpl_ExportDriver.cxx
View File

@ -32,13 +32,13 @@
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#ifdef WNT #ifdef WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#ifdef WNT #ifdef WIN32
#define LibHandle HMODULE #define LibHandle HMODULE
#define LoadLib( name ) LoadLibrary( name ) #define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress #define GetProc GetProcAddress

2
src/GEOMImpl/GEOMImpl_Gen.cxx
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

2
src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

2
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // 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. : On windows with python 2.6, there is a conflict
// E.A. : between pymath.h and Standard_math.h which define // E.A. : between pymath.h and Standard_math.h which define
// E.A. : some same symbols : acosh, asinh, ... // E.A. : some same symbols : acosh, asinh, ...

2
src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

6
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -514,7 +514,7 @@ Standard_Boolean GEOMImpl_IInsertOperations::IsSupported
aKey += aMode; aKey += aMode;
if (myResMgr->Find(aKey.ToCString())) { if (myResMgr->Find(aKey.ToCString())) {
TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString())); TCollection_AsciiString aLibName (myResMgr->Value(aKey.ToCString()));
#ifndef WNT #ifndef WIN32
aLibName += ".so"; aLibName += ".so";
#else #else
aLibName += ".dll"; aLibName += ".dll";
@ -559,7 +559,7 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
// Initialize the Resource Manager // Initialize the Resource Manager
TCollection_AsciiString aNull; TCollection_AsciiString aNull;
aResDir = TCollection_AsciiString(getenv("GEOM_ROOT_DIR")); aResDir = TCollection_AsciiString(getenv("GEOM_ROOT_DIR"));
#ifdef WNT #ifdef WIN32
aResDir += "\\share\\salome\\resources\\geom"; aResDir += "\\share\\salome\\resources\\geom";
#else #else
aResDir += "/share/salome/resources/geom"; aResDir += "/share/salome/resources/geom";
@ -586,7 +586,7 @@ Standard_Boolean GEOMImpl_IInsertOperations::InitResMgr()
else else
{ {
aUserResDir = getenv("HOME"); aUserResDir = getenv("HOME");
#ifdef WNT #ifdef WIN32
aUserResDir += "\\.salome\\resources"; aUserResDir += "\\.salome\\resources";
#else #else
aUserResDir += "/.salome/resources"; aUserResDir += "/.salome/resources";

4
src/GEOMImpl/GEOMImpl_ImportDriver.cxx
View File

@ -36,13 +36,13 @@
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <StdFail_NotDone.hxx> #include <StdFail_NotDone.hxx>
#ifdef WNT #ifdef WIN32
#include <windows.h> #include <windows.h>
#else #else
#include <dlfcn.h> #include <dlfcn.h>
#endif #endif
#ifdef WNT #ifdef WIN32
#define LibHandle HMODULE #define LibHandle HMODULE
#define LoadLib( name ) LoadLibrary( name ) #define LoadLib( name ) LoadLibrary( name )
#define GetProc GetProcAddress #define GetProc GetProcAddress

18
src/GEOMImpl/GEOM_GEOMImpl.hxx
View File

@ -27,22 +27,14 @@
#ifndef _GEOM_GEOMImpl_HXX_ #ifndef _GEOM_GEOMImpl_HXX_
#define _GEOM_GEOMImpl_HXX_ #define _GEOM_GEOMImpl_HXX_
#ifdef WNT #ifdef WIN32
#if defined GEOMIMPL_EXPORTS || defined GEOMImpl_EXPORTS #if defined GEOMIMPL_EXPORTS || defined GEOMImpl_EXPORTS
#if defined WIN32 #define GEOMIMPL_EXPORT __declspec( dllexport )
#define GEOMIMPL_EXPORT __declspec( dllexport )
#else #else
#define GEOMIMPL_EXPORT #define GEOMIMPL_EXPORT __declspec( dllimport )
#endif #endif
#else #else
#if defined WIN32 #define GEOMIMPL_EXPORT
#define GEOMIMPL_EXPORT __declspec( dllimport )
#else
#define GEOMIMPL_EXPORT
#endif
#endif
#else
#define GEOMIMPL_EXPORT
#endif #endif
#endif #endif

2
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
View File

@ -172,7 +172,7 @@ void GEOMToolsGUI_MarkerDlg::setStandardMarker( GEOM::marker_type type, GEOM::ma
myTypeGroup->button( 0 )->setChecked( true ); myTypeGroup->button( 0 )->setChecked( true );
myWGStack->setCurrentIndex( 0 ); myWGStack->setCurrentIndex( 0 );
myStdTypeCombo->setCurrentIndex( (int)type - 1 ); myStdTypeCombo->setCurrentIndex( (int)type - 1 );
#ifdef WNT #ifdef WIN32
int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) ); int asize = max( (int)GEOM::MS_10, min( (int)GEOM::MS_70, (int)size ) );
#else #else
int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) ); int asize = std::max( (int)GEOM::MS_10, std::min( (int)GEOM::MS_70, (int)size ) );

20
src/GEOMToolsGUI/GEOM_ToolsGUI.hxx
View File

@ -27,22 +27,14 @@
#ifndef _GEOM_ToolsGUI_HXX_ #ifndef _GEOM_ToolsGUI_HXX_
#define _GEOM_ToolsGUI_HXX_ #define _GEOM_ToolsGUI_HXX_
#ifdef WNT #ifdef WIN32
#if defined GEOMTOOLSGUI_EXPORTS || defined GEOMToolsGUI_EXPORTS #if defined GEOMTOOLSGUI_EXPORTS || defined GEOMToolsGUI_EXPORTS
#if defined WIN32 #define GEOMTOOLSGUI_EXPORT __declspec( dllexport )
#define GEOMTOOLSGUI_EXPORT __declspec( dllexport )
#else #else
#define GEOMTOOLSGUI_EXPORT #define GEOMTOOLSGUI_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define GEOMTOOLSGUI_EXPORT __declspec( dllimport )
#else
#define GEOMTOOLSGUI_EXPORT
#endif
#endif
#else #else
#define GEOMTOOLSGUI_EXPORT #define GEOMTOOLSGUI_EXPORT
#endif #endif
#endif #endif //_GEOM_ToolsGUI_HXX_

2
src/GEOM_I/GEOM_BaseObject_i.cc
View File

@ -39,7 +39,7 @@
#include <typeinfo> #include <typeinfo>
#endif #endif
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

2
src/GEOM_I/GEOM_DumpPython.cc
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

2
src/GEOM_I/GEOM_Field_i.cc
View File

@ -27,7 +27,7 @@
#include <TCollection_ExtendedString.hxx> #include <TCollection_ExtendedString.hxx>
#include <TColStd_HArray1OfReal.hxx> #include <TColStd_HArray1OfReal.hxx>
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

20
src/GEOM_I/GEOM_GEOM_I.hxx
View File

@ -27,22 +27,14 @@
#ifndef _GEOM_GEOM_I_HXX_ #ifndef _GEOM_GEOM_I_HXX_
#define _GEOM_GEOM_I_HXX_ #define _GEOM_GEOM_I_HXX_
#ifdef WNT #ifdef WIN32
#if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS #if defined GEOM_I_EXPORTS || defined GEOMEngine_EXPORTS
#if defined WIN32 #define GEOM_I_EXPORT __declspec( dllexport )
#define GEOM_I_EXPORT __declspec( dllexport )
#else #else
#define GEOM_I_EXPORT #define GEOM_I_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define GEOM_I_EXPORT __declspec( dllimport )
#else
#define GEOM_I_EXPORT
#endif
#endif
#else #else
#define GEOM_I_EXPORT #define GEOM_I_EXPORT
#endif #endif
#endif #endif //_GEOM_GEOM_I_HXX_

14
src/GEOM_I/GEOM_Gen_i.cc
View File

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

2
src/GEOM_I/GEOM_IInsertOperations_i.cc
View File

@ -20,7 +20,7 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

2
src/GEOM_I/GEOM_Object_i.cc
View File

@ -49,7 +49,7 @@
#include <typeinfo> #include <typeinfo>
#endif #endif
#ifdef WNT #ifdef WIN32
#pragma warning( disable:4786 ) #pragma warning( disable:4786 )
#endif #endif

18
src/IGESExport/IGESExport.cxx
View File

@ -39,22 +39,14 @@
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#ifdef WNT #ifdef WIN32
#if defined IGESEXPORT_EXPORTS || defined IGESExport_EXPORTS #if defined IGESEXPORT_EXPORTS || defined IGESExport_EXPORTS
#if defined WIN32 #define IGESEXPORT_EXPORT __declspec( dllexport )
#define IGESEXPORT_EXPORT __declspec( dllexport )
#else #else
#define IGESEXPORT_EXPORT #define IGESEXPORT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define IGESEXPORT_EXPORT __declspec( dllimport )
#else
#define IGESEXPORT_EXPORT
#endif
#endif
#else #else
#define IGESEXPORT_EXPORT #define IGESEXPORT_EXPORT
#endif #endif
//============================================================================= //=============================================================================

18
src/IGESImport/IGESImport.cxx
View File

@ -53,22 +53,14 @@
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
#ifdef WNT #ifdef WIN32
#if defined IGESIMPORT_EXPORTS || defined IGESImport_EXPORTS #if defined IGESIMPORT_EXPORTS || defined IGESImport_EXPORTS
#if defined WIN32 #define IGESIMPORT_EXPORT __declspec( dllexport )
#define IGESIMPORT_EXPORT __declspec( dllexport )
#else #else
#define IGESIMPORT_EXPORT #define IGESIMPORT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define IGESIMPORT_EXPORT __declspec( dllimport )
#else
#define IGESIMPORT_EXPORT
#endif
#endif
#else #else
#define IGESIMPORT_EXPORT #define IGESIMPORT_EXPORT
#endif #endif
//============================================================================= //=============================================================================

2
src/OperationGUI/OperationGUI.cxx
View File

@ -98,7 +98,7 @@ bool OperationGUI::OnGUIEvent (int theCommandID, SUIT_Desktop* parent)
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT #ifdef WIN32
__declspec( dllexport ) __declspec( dllexport )
#endif #endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )

2
src/RepairGUI/RepairGUI.cxx
View File

@ -113,7 +113,7 @@ bool RepairGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT #ifdef WIN32
__declspec( dllexport ) __declspec( dllexport )
#endif #endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )

18
src/STEPExport/STEPExport.cxx
View File

@ -36,22 +36,14 @@
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
#ifdef WNT #ifdef WIN32
#if defined STEPEXPORT_EXPORTS || defined STEPExport_EXPORTS #if defined STEPEXPORT_EXPORTS || defined STEPExport_EXPORTS
#if defined WIN32 #define STEPEXPORT_EXPORT __declspec( dllexport )
#define STEPEXPORT_EXPORT __declspec( dllexport )
#else #else
#define STEPEXPORT_EXPORT #define STEPEXPORT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define STEPEXPORT_EXPORT __declspec( dllimport )
#else
#define STEPEXPORT_EXPORT
#endif
#endif
#else #else
#define STEPEXPORT_EXPORT #define STEPEXPORT_EXPORT
#endif #endif
//============================================================================= //=============================================================================

18
src/STEPImport/STEPImport.cxx
View File

@ -65,22 +65,14 @@
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
#ifdef WNT #ifdef WIN32
#if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS #if defined STEPIMPORT_EXPORTS || defined STEPImport_EXPORTS
#if defined WIN32 #define STEPIMPORT_EXPORT __declspec( dllexport )
#define STEPIMPORT_EXPORT __declspec( dllexport )
#else #else
#define STEPIMPORT_EXPORT #define STEPIMPORT_EXPORT __declspec( dllimport )
#endif #endif
#else
#if defined WIN32
#define STEPIMPORT_EXPORT __declspec( dllimport )
#else
#define STEPIMPORT_EXPORT
#endif
#endif
#else #else
#define STEPIMPORT_EXPORT #define STEPIMPORT_EXPORT
#endif #endif
//============================================================================= //=============================================================================

2
src/TransformationGUI/TransformationGUI.cxx
View File

@ -168,7 +168,7 @@ bool TransformationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent )
//===================================================================================== //=====================================================================================
extern "C" extern "C"
{ {
#ifdef WNT #ifdef WIN32
__declspec( dllexport ) __declspec( dllexport )
#endif #endif
GEOMGUI* GetLibGUI( GeometryGUI* parent ) GEOMGUI* GetLibGUI( GeometryGUI* parent )