projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unnecessary rendering.
[bertos.git]
/
os
/
hptime.c
diff --git
a/os/hptime.c
b/os/hptime.c
index c84524d7406d32240f88f19263dd7e486dd99c26..57ccf34df46462c52fa6657a199558f5e47b30d7 100755
(executable)
--- a/
os/hptime.c
+++ b/
os/hptime.c
@@
-2,7
+2,7
@@
* \file
* <!--
* Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
* \file
* <!--
* Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See
devlib/README
for information.
+ * This file is part of DevLib - See
README.devlib
for information.
* -->
*
* \brief Portable abstraction for high-resolution time handling (implementation)
* -->
*
* \brief Portable abstraction for high-resolution time handling (implementation)
@@
-13,6
+13,12
@@
/*#*
*#* $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.4 2004/08/25 14:12:09 rasky
*#* Aggiornato il comment block dei log RCS
*#*
*#* Revision 1.4 2004/08/25 14:12:09 rasky
*#* Aggiornato il comment block dei log RCS
*#*
@@
-50,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>