projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use demo as default app.
[bertos.git]
/
os
/
hptime.h
diff --git
a/os/hptime.h
b/os/hptime.h
index 2a9670248e9e8feed0ab3a85afad72220a00fa4f..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/)
* \file
* <!--
* Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
@@
-13,6
+13,12
@@
/*#*
*#* $Log$
/*#*
*#* $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.7 2006/01/16 03:28:25 bernie
*#* Remove redundant mtime_t definition (cfg/compiler.h has one already).
*#*
@@
-51,11
+57,11
@@
extern "C" {
#define HPTIME_TICKS_PER_MILLISEC ((hptime_t)10000I64)
#define HPTIME_TICKS_PER_MICRO ((hptime_t)10I64)
#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>
#include <stdint.h>
- /**
our type for "high precision absolute time"
*/
+ /**
Type for "high precision absolute time".
*/
typedef int64_t hptime_t;
#define HPTIME_TICKS_PER_SECOND 1000000LL
typedef int64_t hptime_t;
#define HPTIME_TICKS_PER_SECOND 1000000LL