Merge branch 'V8_4_BR'

[modules/smesh.git] / src / SMESH / memoire.h

diff --git a/src/SMESH/memoire.h b/src/SMESH/memoire.h
index 51db0552ef42b7f892bb55c61ec28c2c4f44b569..ef953601fd8e7e51376ec621764f860dd98fb7d9 100644 (file)
--- a/src/SMESH/memoire.h
+++ b/src/SMESH/memoire.h
@@ -20,14 +20,18 @@
 #ifndef _MEMOIRE_H_
 #define _MEMOIRE_H_
 
+#ifdef __APPLE__
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 #include <iostream>
 
 void memostat(const char* f, int l);
 
 void memostat(const char* f, int l)
 {
-#ifdef WIN32
+#if defined WIN32 || defined __APPLE__
         //rnv: TODO: find alternative of the malloc_stats() on windows platform
 #else
   struct mallinfo mem = mallinfo();
@@ -38,6 +42,10 @@ void memostat(const char* f, int l)
 #endif
 }
 
-#define MEMOSTAT memostat( __FILE__, __LINE__ )
+#if defined(_DEBUG_) || defined(_DEBUG)
+#define MEMOSTAT //memostat( __FILE__, __LINE__ )
+#else
+#define MEMOSTAT
+#endif
 
 #endif