OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0027801: Configuration - fix compilation of Standard.cxx when using MinGW-W64

Browse Source
This commit is contained in:
kgv 2016-08-23 15:00:50 +03:00 committed by bugmaster
parent e5b8456d5b
commit 94afca11a0
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/OSD/OSD_signal.cxx
View File

@ -60,10 +60,11 @@
#include <signal.h> #include <signal.h>
#include <float.h> #include <float.h>
static Standard_Boolean fCtrlBrk;
#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
static Standard_Boolean fMsgBox; static Standard_Boolean fMsgBox;
static Standard_Boolean fFltExceptions; static Standard_Boolean fFltExceptions;
static Standard_Boolean fDbgLoaded; static Standard_Boolean fDbgLoaded;
static Standard_Boolean fCtrlBrk;
// used to forbid simultaneous execution of setting / executing handlers // used to forbid simultaneous execution of setting / executing handlers
static Standard_Mutex THE_SIGNAL_MUTEX; static Standard_Mutex THE_SIGNAL_MUTEX;
@ -84,9 +85,6 @@ static LONG CallHandler (DWORD dwExceptionCode,
ptrdiff_t ExceptionInformation1, ptrdiff_t ExceptionInformation1,
ptrdiff_t ExceptionInformation0) ptrdiff_t ExceptionInformation0)
{ {
#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling
static char buffer[ 2048 ]; static char buffer[ 2048 ];
int flterr = 0; int flterr = 0;
@ -240,9 +238,6 @@ static LONG CallHandler (DWORD dwExceptionCode,
// cout << "OSD::WntHandler _controlfp( 0, _OSD_FPX ) " << hex << _controlfp(0,0) << dec << endl ; // cout << "OSD::WntHandler _controlfp( 0, _OSD_FPX ) " << hex << _controlfp(0,0) << dec << endl ;
} }
return _osd_raise ( dwExceptionCode, buffer ); return _osd_raise ( dwExceptionCode, buffer );
#else
return 0;
#endif
} }
//======================================================================= //=======================================================================
@ -253,7 +248,6 @@ static LONG CallHandler (DWORD dwExceptionCode,
//======================================================================= //=======================================================================
static void SIGWntHandler (int signum, int sub_code) static void SIGWntHandler (int signum, int sub_code)
{ {
#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling Standard_Mutex::Sentry aSentry (THE_SIGNAL_MUTEX); // lock the mutex to prevent simultaneous handling
switch( signum ) { switch( signum ) {
case SIGFPE : case SIGFPE :
@ -299,8 +293,8 @@ static void SIGWntHandler (int signum, int sub_code)
break ; break ;
} }
DebugBreak (); DebugBreak ();
#endif
} }
#endif
//======================================================================= //=======================================================================
//function : TranslateSE //function : TranslateSE
@ -333,6 +327,7 @@ static void TranslateSE( unsigned int theCode, EXCEPTION_POINTERS* theExcPtr )
// option and unless user sets his own exception handler with // option and unless user sets his own exception handler with
// ::SetUnhandledExceptionFilter(). // ::SetUnhandledExceptionFilter().
//======================================================================= //=======================================================================
#if !defined(__CYGWIN32__) && !defined(__MINGW32__)
static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP) static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP)
{ {
DWORD dwExceptionCode = lpXP->ExceptionRecord->ExceptionCode; DWORD dwExceptionCode = lpXP->ExceptionRecord->ExceptionCode;
@ -341,6 +336,7 @@ static LONG WINAPI WntHandler (EXCEPTION_POINTERS *lpXP)
lpXP->ExceptionRecord->ExceptionInformation[1], lpXP->ExceptionRecord->ExceptionInformation[1],
lpXP->ExceptionRecord->ExceptionInformation[0]); lpXP->ExceptionRecord->ExceptionInformation[0]);
} }
#endif
//======================================================================= //=======================================================================
//function : SetSignal //function : SetSignal
@ -409,6 +405,7 @@ void OSD::ControlBreak () {
} }
} // end OSD :: ControlBreak } // end OSD :: ControlBreak
#if !defined(__MINGW32__) && !defined(__CYGWIN32__)
//============================================================================ //============================================================================
//==== _osd_ctrl_break_handler //==== _osd_ctrl_break_handler
//============================================================================ //============================================================================
@ -490,12 +487,6 @@ static LONG __fastcall _osd_raise ( DWORD dwCode, LPSTR msg )
//============================================================================ //============================================================================
//==== _osd_debug //==== _osd_debug
//============================================================================ //============================================================================
#if defined(__CYGWIN32__) || defined(__MINGW32__)
#define __try
#define __finally
#define __leave return 0
#endif
LONG _osd_debug ( void ) { LONG _osd_debug ( void ) {
LONG action ; LONG action ;
@ -578,11 +569,6 @@ LONG _osd_debug ( void ) {
return action ; return action ;
} // end _osd_debug } // end _osd_debug
#if defined(__CYGWIN32__) || defined(__MINGW32__)
#undef __try
#undef __finally
#undef __leave
#endif #endif
#else #else

6
src/Standard/Standard.cxx
View File

@ -30,7 +30,7 @@
#if defined(_MSC_VER) || defined(__ANDROID__) || defined(__QNX__) #if defined(_MSC_VER) || defined(__ANDROID__) || defined(__QNX__)
#include <malloc.h> #include <malloc.h>
#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && defined(__i386)) #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && (defined(__i386) || defined(__x86_64)))
#include <mm_malloc.h> #include <mm_malloc.h>
#else #else
extern "C" int posix_memalign (void** thePtr, size_t theAlign, size_t theSize); extern "C" int posix_memalign (void** thePtr, size_t theAlign, size_t theSize);
@ -274,7 +274,7 @@ Standard_Address Standard::AllocateAligned (const Standard_Size theSize,
return _aligned_malloc (theSize, theAlign); return _aligned_malloc (theSize, theAlign);
#elif defined(__ANDROID__) || defined(__QNX__) #elif defined(__ANDROID__) || defined(__QNX__)
return memalign (theAlign, theSize); return memalign (theAlign, theSize);
#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && defined(__i386)) #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && (defined(__i386) || defined(__x86_64)))
return _mm_malloc (theSize, theAlign); return _mm_malloc (theSize, theAlign);
#else #else
void* aPtr; void* aPtr;
@ -297,7 +297,7 @@ void Standard::FreeAligned (Standard_Address thePtrAligned)
_aligned_free (thePtrAligned); _aligned_free (thePtrAligned);
#elif defined(__ANDROID__) || defined(__QNX__) #elif defined(__ANDROID__) || defined(__QNX__)
free (thePtrAligned); free (thePtrAligned);
#elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && defined(__i386)) #elif (defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 1 && (defined(__i386) || defined(__x86_64)))
_mm_free (thePtrAligned); _mm_free (thePtrAligned);
#else #else
free (thePtrAligned); free (thePtrAligned);