Do not cast constants because we need to evaluate them with the preprocessor.

[bertos.git] / os / hptime.h

diff --git a/os/hptime.h b/os/hptime.h
index edf80284aa2c3c11d679ea24cb5f86b373214775..e5ec70d8ec2d2151d87fef16527bf9f1ccfa6abe 100755 (executable)
--- a/os/hptime.h
+++ b/os/hptime.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
@@ -10,25 +10,6 @@
  * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
  */
-
-/*#*
- *#* $Log$
- *#* Revision 1.5  2005/11/04 16:20:02  bernie
- *#* Fix reference to README.devlib in header.
- *#*
- *#* Revision 1.4  2004/08/25 14:12:09  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.3  2004/08/10 05:45:04  bernie
- *#* Fix spacing in header.
- *#*
- *#* Revision 1.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.1  2004/06/03 09:01:06  bernie
- *#* Import into DevLib.
- *#*
- *#*/
 #ifndef HPTIME_H
 #define HPTIME_H
 
@@ -38,33 +19,29 @@ extern "C" {
 
 #ifdef _WIN32
 
-       /* type for time expressed in ms */
-       typedef unsigned long mtime_t;
-
-       /* our type for "high precision absolute time" */
-       typedef unsigned __int64 hptime_t;
+       /** our type for "high precision absolute time" */
+       typedef __int64 hptime_t;
 
-       #define HPTIME_TICKS_PER_SECOND         ((hptime_t)10000000I64)
-       #define HPTIME_TICKS_PER_MILLISEC       ((hptime_t)10000I64)
-       #define HPTIME_TICKS_PER_MICRO          ((hptime_t)10I64)
+       #define HPTIME_TICKS_PER_SECOND         (10000000I64)
+       #define HPTIME_TICKS_PER_MILLISEC       (10000I64)
+       #define HPTIME_TICKS_PER_MICRO          (10I64)
 
-#elif defined(__unix__)
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 
-       /* type for time expressed in ms */
-       typedef long mtime_t;
+       #include <stdint.h> /* int64_t */
 
-       /* our type for "high precision absolute time" */
-       typedef long long hptime_t;
+       /** Type for "high precision absolute time". */
+       typedef int64_t hptime_t;
 
-       #define HPTIME_TICKS_PER_SECOND         ((hptime_t)1000000LL)
-       #define HPTIME_TICKS_PER_MILLISEC       ((hptime_t)1000LL)
-       #define HPTIME_TICKS_PER_MICRO          ((hptime_t)1LL)
+       #define HPTIME_TICKS_PER_SECOND         (1000000LL)
+       #define HPTIME_TICKS_PER_MILLISEC       (1000LL)
+       #define HPTIME_TICKS_PER_MICRO          (1LL)
 
 #else /* !__unix__ */
        #error OS dependent support code missing for this OS
 #endif /* !__unix__ */
 
-/*!
+/**
  * Return the current time with the maximum precision made available from the hosting OS
  */
 extern hptime_t hptime_get(void);