Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

[clitk.git] / common / clitkMemoryUsage.cxx

diff --git a/common/clitkMemoryUsage.cxx b/common/clitkMemoryUsage.cxx
index c0b78ce4ddee203a40a0e216a1ffca69d80d0af9..c95c2859b925e7f7dfa24575e4b53d28d88f53b6 100644 (file)
--- a/common/clitkMemoryUsage.cxx
+++ b/common/clitkMemoryUsage.cxx
@@ -19,7 +19,9 @@
 // clitk include
 #include "clitkCommon.h"
 #include "clitkMemoryUsage.h"
-#include <unistd.h>
+#ifndef _WIN32
+#  include <unistd.h>
+#endif
 
 void clitk::PrintMemory(bool verbose, std::string s) 
 {
@@ -47,7 +49,7 @@ double clitk::GetMemoryUsageInMb()
   // Search the current pid in the list of processes
   while (stat[i].pid != getpid()) i++;
   // Display total memory size 
-  double mem = stat[i].proc_resident/1024/1024; // in Mb
+  double mem = stat[i].proc_resident/1000/1000; // in MB
   return mem;
 #else
   return 0.0;