projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore generated files.
[bertos.git]
/
os
/
hptime.c
diff --git
a/os/hptime.c
b/os/hptime.c
index 7c53d9dfb959f95a4516dcd3c36a8019eac2f40c..57ccf34df46462c52fa6657a199558f5e47b30d7 100755
(executable)
--- a/
os/hptime.c
+++ b/
os/hptime.c
@@
-13,6
+13,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.6 2006/02/20 01:46:46 bernie
+ *#* Port to MacOSX.
+ *#*
*#* Revision 1.5 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
*#* Revision 1.5 2005/11/04 16:20:02 bernie
*#* Fix reference to README.devlib in header.
*#*
@@
-53,7
+56,7
@@
hptime_t hptime_get(void)
return (((hptime_t)ft.dwHighDateTime) << 32) + (hptime_t)ft.dwLowDateTime;
}
return (((hptime_t)ft.dwHighDateTime) << 32) + (hptime_t)ft.dwLowDateTime;
}
-#elif defined(__unix__)
+#elif defined(__unix__)
|| defined(__APPLE__) && defined(__MACH__)
#include <sys/time.h>
#include <sys/time.h>