X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.h;h=99b66339080f001e0596b5fb484ecb849cecdf24;hb=4bf15025c3fe95a226686b793e39a44f5f08d7da;hp=d38258b4c9c26b44952101e8831b3260f60ee604;hpb=1d55c78510de09af02b18626e3f9ceef2af01f69;p=bertos.git

diff --git a/os/hptime.h b/os/hptime.h
index d38258b4..99b66339 100755
--- 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,28 +10,6 @@
  * \version $Id$
  * \author Bernardo Innocenti <bernie@develer.com>
  */
-
-/*#*
- *#* $Log$
- *#* Revision 1.6  2005/11/27 03:57:22  bernie
- *#* Use C99 types to match cfg/compiler.h without depending on it.
- *#*
- *#* 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
 
@@ -41,29 +19,30 @@ 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;
+	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__))
 
-	#include <stdint.h>
+	#include <stdint.h> /* int64_t */
 
-	/** type for time expressed in ms */
-	typedef int32_t mtime_t;
+	#ifndef DEVLIB_MTIME_DEFINED
+		#define DEVLIB_MTIME_DEFINED 1 /* Resolve conflict with <cfg/compiler.h> */
+		typedef int32_t mtime_t;
+		#define SIZEOF_MTIME_T (32 / CPU_BITS_PER_CHAR)
+		#define MTIME_INFINITE 0x7FFFFFFFL
+	#endif
 
-	/** our type for "high precision absolute time" */
+	/** Type for "high precision absolute time". */
 	typedef int64_t hptime_t;
 
-	#define HPTIME_TICKS_PER_SECOND		1000000LL
-	#define HPTIME_TICKS_PER_MILLISEC	1000LL
-	#define HPTIME_TICKS_PER_MICRO		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