X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.h;h=20994e815534ca0d9cbea6e6d838f72902b18d2a;hb=7b3578b47c87c81dfe44a38404898c5664b3c3f3;hp=d38258b4c9c26b44952101e8831b3260f60ee604;hpb=1d55c78510de09af02b18626e3f9ceef2af01f69;p=bertos.git

diff --git a/os/hptime.h b/os/hptime.h
index d38258b4..20994e81 100755
--- a/os/hptime.h
+++ b/os/hptime.h
@@ -13,6 +13,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/02/20 01:46:46  bernie
+ *#* Port to MacOSX.
+ *#*
+ *#* Revision 1.7  2006/01/16 03:28:25  bernie
+ *#* Remove redundant mtime_t definition (cfg/compiler.h has one already).
+ *#*
  *#* Revision 1.6  2005/11/27 03:57:22  bernie
  *#* Use C99 types to match cfg/compiler.h without depending on it.
  *#*
@@ -41,23 +47,17 @@ 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)
 
-#elif defined(__unix__)
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 
 	#include <stdint.h>
 
-	/** type for time expressed in ms */
-	typedef int32_t mtime_t;
-
 	/** our type for "high precision absolute time" */
 	typedef int64_t hptime_t;