projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change doxygen \param tag to \a.
[bertos.git]
/
os
/
hptime.c
diff --git
a/os/hptime.c
b/os/hptime.c
index e4016d1b55ae561a886bb0e7270f4c1ac97bb780..771832307efe1493b58a327ef4541ccf1132070d 100755
(executable)
--- a/
os/hptime.c
+++ b/
os/hptime.c
@@
-1,8
+1,8
@@
-/*
!
+/*
*
* \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)
@@
-11,19
+11,6
@@
* \author Bernardo Innocenti <bernie@develer.com>
*/
* \author Bernardo Innocenti <bernie@develer.com>
*/
-/*
- * $Log$
- * Revision 1.3 2004/08/10 05:45:04 bernie
- * Fix spacing in header.
- *
- * Revision 1.2 2004/06/03 11:27:09 bernie
- * Add dual-license information.
- *
- * Revision 1.1 2004/06/03 09:01:06 bernie
- * Import into DevLib.
- *
- */
-
#include "hptime.h"
#if defined(_WIN32)
#include "hptime.h"
#if defined(_WIN32)
@@
-47,15
+34,16
@@
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> /* for gettimeofday() */
+#include <stddef.h> /* for NULL */
hptime_t hptime_get(void)
{
struct timeval tv;
hptime_t hptime_get(void)
{
struct timeval tv;
- gettimeofday(&tv,
0
);
+ gettimeofday(&tv,
NULL
);
return (hptime_t)tv.tv_sec * HPTIME_TICKS_PER_SECOND
+ (hptime_t)tv.tv_usec;
}
return (hptime_t)tv.tv_sec * HPTIME_TICKS_PER_SECOND
+ (hptime_t)tv.tv_usec;
}