projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add MOD_CHECK() checks.
[bertos.git]
/
os
/
hptime.h
diff --git
a/os/hptime.h
b/os/hptime.h
index d38258b4c9c26b44952101e8831b3260f60ee604..2a9670248e9e8feed0ab3a85afad72220a00fa4f 100755
(executable)
--- a/
os/hptime.h
+++ b/
os/hptime.h
@@
-13,6
+13,9
@@
/*#*
*#* $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.6 2005/11/27 03:57:22 bernie
*#* Use C99 types to match cfg/compiler.h without depending on it.
*#*
@@
-41,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" */
/** our type for "high precision absolute time" */
- typedef
unsigned
__int64 hptime_t;
+ 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)
@@
-55,9
+55,6
@@
extern "C" {
#include <stdint.h>
#include <stdint.h>
- /** type for time expressed in ms */
- typedef int32_t mtime_t;
-
/** our type for "high precision absolute time" */
typedef int64_t hptime_t;
/** our type for "high precision absolute time" */
typedef int64_t hptime_t;