OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0027713: Test bugs fclasses bug6143 is not OK for Linux after restoring FPS (26329)

Browse Source 
Use standard (POSIX-compliant) macro "__linux__" for identification of Linux system, instead of obsolete "linux"
This commit is contained in:
abv
2016-08-29 06:22:44 +03:00
committed by kgv
parent f4dee9bb20
commit c381fda2d6
6 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OSD/OSD_Chronometer.cxx
View File

@@ -57,7 +57,7 @@
//=======================================================================
void OSD_Chronometer::GetProcessCPU (Standard_Real& UserSeconds, Standard_Real& SystemSeconds)
{
#if defined(__linux__) || defined(linux) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__)
#if defined(__linux__) || defined(__FreeBSD__) || defined(__ANDROID__) || defined(__QNX__)
static const long aCLK_TCK = sysconf(_SC_CLK_TCK);
#else
static const long aCLK_TCK = CLK_TCK;

10
src/OSD/OSD_signal.cxx
View File

@@ -615,7 +615,7 @@ LONG _osd_debug ( void ) {
// POSIX threads
#include <pthread.h>
#ifdef linux
#ifdef __linux__
#include <fenv.h>
static Standard_Boolean fFltExceptions = Standard_False;
#endif
@@ -798,7 +798,7 @@ static void Handler (const int theSignal)
// cout << "OSD::Handler: signal " << (int) theSignal << " occured inside a try block " << endl ;
if ( ADR_ACT_SIGIO_HANDLER != NULL )
(*ADR_ACT_SIGIO_HANDLER)() ;
#ifdef linux
#ifdef __linux__
if (fFltExceptions)
feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
//feenableexcept (FE_INVALID | FE_DIVBYZERO);
@@ -922,7 +922,7 @@ static void SegvHandler(const int theSignal,
(void)theSignal; // silence GCC warnings
(void)theContext;
#endif
#ifdef linux
#ifdef __linux__
if (fFltExceptions)
feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
//feenableexcept (FE_INVALID | FE_DIVBYZERO);
@@ -1009,7 +1009,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
cerr << "ieee_handler does not work !!! KO " << endl;
#endif
}
#elif defined (linux)
#elif defined (__linux__)
feenableexcept (FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW);
//feenableexcept (FE_INVALID | FE_DIVBYZERO);
fFltExceptions = Standard_True;
@@ -1096,7 +1096,7 @@ void OSD::SetSignal(const Standard_Boolean aFloatingSignal)
sigaction(SIGBUS,&oact,&oact);
#endif
#if (!defined (linux)) && (!defined(__linux__))
#if !defined(__linux__)
sigaction(SIGSYS,&act,&oact); // ...... bad argument to system call
# ifdef OBJS