X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkTimer.h;h=725a3b2bd506dbce7b2c7e1bfbb8de70e99da37f;hb=1dfeba065d7121eb27aa44a792095af817652683;hp=c1730ed625f29b0d89511dca0174a7a57b78960a;hpb=0083c3fb2c66812489631c7551709d121de51625;p=clitk.git

diff --git a/common/clitkTimer.h b/common/clitkTimer.h
index c1730ed..725a3b2 100644
--- a/common/clitkTimer.h
+++ b/common/clitkTimer.h
@@ -1,21 +1,29 @@
-#ifndef CLITKTIMER_H
-#define CLITKTIMER_H
-/**
-   ===================================================================
-   * @file   clitkTimer.h
-   * @author David Sarrut <David.Sarrut@creatis.insa-lyon.fr>
-   * @date   18 Jul 2007 16:26:08
+/*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
+
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-   * @brief  
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-   ===================================================================*/
+  It is distributed under dual licence
+
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+===========================================================================**/
+#ifndef CLITKTIMER_H
+#define CLITKTIMER_H
 
-#include "clitkCommon.h"
+//#include "clitkCommon.h"
 #include <ctime> 
-#if defined(unix)
+#if defined(unix) || defined(__APPLE__)
 #  include <sys/time.h>
 #  include <sys/resource.h>
-#elif defined(WIN32)
+#elif defined(_WIN32)
 #  include <windows.h>
 #endif
 #include <iostream>
@@ -42,10 +50,10 @@ namespace clitk {
     //====================================================================
     
   protected:
-#if defined(unix)
+#if defined(unix) || defined(__APPLE__)
     rusage mBegin; 
     rusage mEnd;
-#elif defined(WIN32)
+#elif defined(_WIN32)
     unsigned __int64 mBegin;
     unsigned __int64 mEnd;
     unsigned __int64 mFrequency;