From: vsr <vsr@opencascade.com>
Date: Fri, 20 Jan 2017 13:06:42 +0000 (+0300)
Subject: Patch for MacOS (from SALOME forum)
X-Git-Tag: V8_3_0a2~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6bf54bb729d4c6bcc4b0f635d6b6f9466ef80b21;p=tools%2Fmedcoupling.git

Patch for MacOS (from SALOME forum)
---

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 <iostream>
 #include <fstream>
 
-#ifndef WIN32
+#if !defined WIN32 && !defined __APPLE__
 #include <fpu_control.h>
 #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 <sys/sysinfo.h>
 #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 )