projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting.
[bertos.git]
/
os
/
hptime.h
diff --git
a/os/hptime.h
b/os/hptime.h
index 2a9670248e9e8feed0ab3a85afad72220a00fa4f..20994e815534ca0d9cbea6e6d838f72902b18d2a 100755
(executable)
--- a/
os/hptime.h
+++ b/
os/hptime.h
@@
-13,6
+13,9
@@
/*#*
*#* $Log$
/*#*
*#* $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.7 2006/01/16 03:28:25 bernie
*#* Remove redundant mtime_t definition (cfg/compiler.h has one already).
*#*
@@
-51,7
+54,7
@@
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>