Portability: Mac

diff --git a/src/MEDCoupling_Swig/MEDCouplingCommon.i b/src/MEDCoupling_Swig/MEDCouplingCommon.i
index d3404b6a4a3764cd8a3c2af32be3ca44c7db0b8e..e971e5345a9e814f6187af2103f8c8ef5b339c7c 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingCommon.i
+++ b/src/MEDCoupling_Swig/MEDCouplingCommon.i
@@ -73,7 +73,7 @@ using namespace INTERP_KERNEL;
 typedef int mcIdType;
 typedef DataArrayInt32 DataArrayIdType;
 %template(ivec) std::vector<int>;
-%template(i64vec) std::vector<long>;
+%template(i64vec) std::vector<int64_t>;
 #else
 //typedef std::int64_t mcIdType;
 typedef DataArrayInt64 DataArrayIdType;

diff --git a/src/MEDLoader/MeshFormatReader.hxx b/src/MEDLoader/MeshFormatReader.hxx
index abf0160e0d8bd37fdc3fd92f9a9726e52e0989c8..8631966c482964767b1420fee67cc97035b6490d 100644 (file)
--- a/src/MEDLoader/MeshFormatReader.hxx
+++ b/src/MEDLoader/MeshFormatReader.hxx
@@ -35,7 +35,7 @@
 
 #include <fstream>
 
-#ifndef WIN32
+#if !defined(WIN32) && !defined(__APPLE__)
 #include <features.h>
 #endif