projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced ISLISTEMPTY with LIST_EMPTY
[bertos.git]
/
os
/
hptime.c
diff --git
a/os/hptime.c
b/os/hptime.c
index 7c53d9dfb959f95a4516dcd3c36a8019eac2f40c..71e920ca5d8d24a5212a633471a6133dd32c54b2 100755
(executable)
--- a/
os/hptime.c
+++ b/
os/hptime.c
@@
-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,15
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.8 2006/07/19 12:56:28 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.7 2006/07/19 12:53:58 bernie
+ *#* Documentation fixes.
+ *#*
+ *#* 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
+62,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>