From 6bf54bb729d4c6bcc4b0f635d6b6f9466ef80b21 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 20 Jan 2017 16:06:42 +0300 Subject: [PATCH] Patch for MacOS (from SALOME forum) --- src/INTERP_KERNELTest/BasicMainTest.hxx | 6 +++--- src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/INTERP_KERNELTest/BasicMainTest.hxx b/src/INTERP_KERNELTest/BasicMainTest.hxx index 560ca52ca..f2b40ad21 100644 --- a/src/INTERP_KERNELTest/BasicMainTest.hxx +++ b/src/INTERP_KERNELTest/BasicMainTest.hxx @@ -32,7 +32,7 @@ #include #include -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ #include #endif @@ -45,7 +45,7 @@ int main(int argc, char* argv[]) { -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ fpu_control_t cw = _FPU_DEFAULT & ~(_FPU_MASK_IM | _FPU_MASK_ZM | _FPU_MASK_OM); _FPU_SETCW(cw); #endif @@ -57,7 +57,7 @@ int main(int argc, char* argv[]) controller.addListener( &result ); // --- Add a listener that print dots as test run. -#ifdef WIN32 +#if !defined WIN32 && !defined __APPLE__ CPPUNIT_NS::TextTestProgressListener progress; #else CPPUNIT_NS::BriefTestProgressListener progress; diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx index 9beacb204..f91be6f25 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx @@ -646,7 +646,7 @@ void MEDPARTITIONER::ParaDomainSelector::recvMesh(MEDCoupling::MEDCouplingUMesh* #endif } -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ #include #endif @@ -658,7 +658,7 @@ int MEDPARTITIONER::ParaDomainSelector::evaluateMemory() const if ( _mesure_memory ) { int used_memory = 0; -#ifndef WIN32 +#if !defined WIN32 && !defined __APPLE__ struct sysinfo si; int err = sysinfo( &si ); if ( !err ) -- 2.39.2