X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkTimer.cxx;h=329ca13f04272d44104a3f0926e54e3b0e5b0aa8;hb=543b72e23ad001ac2a7743b9beacf48e2d0054ac;hp=f01d77c1426d9ca45d35f4fdf0ca790832f5ef29;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git

diff --git a/common/clitkTimer.cxx b/common/clitkTimer.cxx
index f01d77c..329ca13 100644
--- a/common/clitkTimer.cxx
+++ b/common/clitkTimer.cxx
@@ -37,7 +37,7 @@
 clitk::Timer::Timer()
 {
   Reset();
-#if defined(WIN32)
+#if defined(_WIN32)
   QueryPerformanceFrequency((LARGE_INTEGER*)&mFrequency);
 #endif
 }
@@ -48,7 +48,7 @@ void clitk::Timer::Start()
 {
 #if defined(unix) || defined(__APPLE__)
   getrusage(RUSAGE_SELF, &mBegin);
-#elif defined(WIN32)
+#elif defined(_WIN32)
   QueryPerformanceCounter((LARGE_INTEGER*)&mBegin);
 #endif
   mNumberOfCall++;
@@ -64,13 +64,15 @@ void clitk::Timer::Stop(bool accumulate)
     mElapsed += (mEnd.ru_utime.tv_usec - mBegin.ru_utime.tv_usec)+
                 (mEnd.ru_utime.tv_sec - mBegin.ru_utime.tv_sec)*1000000;
   }
-#elif defined(WIN32)
+  else
+#elif defined(_WIN32)
   QueryPerformanceCounter((LARGE_INTEGER*)&mEnd);
   if (accumulate) {
     mElapsed += ((mEnd-mBegin)*1000000)/(long double)mFrequency;
   }
+  else
 #endif
-  else {
+  {
     mNumberOfCall--;
   }
 }
@@ -114,4 +116,3 @@ void clitk::Timer::Reset()
 
 // #endif // If UNIX
 #endif /* end #define CLITKTIMER_CXX */
-