Use demo as default app.

[bertos.git] / os / hptime.h

diff --git a/os/hptime.h b/os/hptime.h
index d38258b4c9c26b44952101e8831b3260f60ee604..4eb91a6d9ce49ce10c37ddf11c638bf513e71598 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/)
@@ -13,6 +13,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.9  2006/07/19 12:53:58  bernie
+ *#* Documentation fixes.
+ *#*
+ *#* 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,24 +50,18 @@ 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" */
+       /** Type for "high precision absolute time". */
        typedef int64_t hptime_t;
 
        #define HPTIME_TICKS_PER_SECOND         1000000LL