projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import into DevLib.
[bertos.git]
/
os
/
hptime.h
diff --git
a/os/hptime.h
b/os/hptime.h
index edf80284aa2c3c11d679ea24cb5f86b373214775..2a9670248e9e8feed0ab3a85afad72220a00fa4f 100755
(executable)
--- a/
os/hptime.h
+++ b/
os/hptime.h
@@
-13,6
+13,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.7 2006/01/16 03:28:25 bernie
+ *#* Remove redundant mtime_t definition (cfg/compiler.h has one already).
+ *#*
+ *#* Revision 1.6 2005/11/27 03:57:22 bernie
+ *#* Use C99 types to match cfg/compiler.h without depending on it.
+ *#*
*#* 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.
*#*
@@
-38,11
+44,8
@@
extern "C" {
#ifdef _WIN32
#ifdef _WIN32
- /* type for time expressed in ms */
- typedef unsigned long mtime_t;
-
- /* our type for "high precision absolute time" */
- typedef unsigned __int64 hptime_t;
+ /** our type for "high precision absolute time" */
+ typedef __int64 hptime_t;
#define HPTIME_TICKS_PER_SECOND ((hptime_t)10000000I64)
#define HPTIME_TICKS_PER_MILLISEC ((hptime_t)10000I64)
#define HPTIME_TICKS_PER_SECOND ((hptime_t)10000000I64)
#define HPTIME_TICKS_PER_MILLISEC ((hptime_t)10000I64)
@@
-50,21
+53,20
@@
extern "C" {
#elif defined(__unix__)
#elif defined(__unix__)
- /* type for time expressed in ms */
- typedef long mtime_t;
+ #include <stdint.h>
- /* our type for "high precision absolute time" */
- typedef
long long
hptime_t;
+ /*
*
our type for "high precision absolute time" */
+ typedef
int64_t
hptime_t;
- #define HPTIME_TICKS_PER_SECOND
((hptime_t)1000000LL)
- #define HPTIME_TICKS_PER_MILLISEC
((hptime_t)1000LL)
- #define HPTIME_TICKS_PER_MICRO
((hptime_t)1LL)
+ #define HPTIME_TICKS_PER_SECOND
1000000LL
+ #define HPTIME_TICKS_PER_MILLISEC
1000LL
+ #define HPTIME_TICKS_PER_MICRO
1LL
#else /* !__unix__ */
#error OS dependent support code missing for this OS
#endif /* !__unix__ */
#else /* !__unix__ */
#error OS dependent support code missing for this OS
#endif /* !__unix__ */
-/*
!
+/*
*
* Return the current time with the maximum precision made available from the hosting OS
*/
extern hptime_t hptime_get(void);
* Return the current time with the maximum precision made available from the hosting OS
*/
extern hptime_t hptime_get(void);