From 660dbab0d8c8010a42a4f336f87ff362fd7eb457 Mon Sep 17 00:00:00 2001 From: bernie Date: Wed, 25 Oct 2006 14:35:44 +0000 Subject: [PATCH] Cast constants to hptime_t. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@725 38d2e660-2303-0410-9eaa-f027e97ec537 --- os/hptime.c | 29 ----------------------------- os/hptime.h | 39 ++++----------------------------------- 2 files changed, 4 insertions(+), 64 deletions(-) diff --git a/os/hptime.c b/os/hptime.c index 71e920ca..33427e6b 100755 --- a/os/hptime.c +++ b/os/hptime.c @@ -10,35 +10,6 @@ * \version $Id$ * \author Bernardo Innocenti */ - -/*#* - *#* $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.4 2004/08/25 14:12:09 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* 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) diff --git a/os/hptime.h b/os/hptime.h index 4eb91a6d..2b27b6ef 100755 --- a/os/hptime.h +++ b/os/hptime.h @@ -10,37 +10,6 @@ * \version $Id$ * \author Bernardo Innocenti */ - -/*#* - *#* $Log$ - *#* Revision 1.9 2006/07/19 12:53:58 bernie - *#* Documentation fixes. - *#* - *#* Revision 1.8 2006/02/20 01:46:46 bernie - *#* Port to MacOSX. - *#* - *#* 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.4 2004/08/25 14:12:09 rasky - *#* Aggiornato il comment block dei log RCS - *#* - *#* 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. - *#* - *#*/ #ifndef HPTIME_H #define HPTIME_H @@ -59,14 +28,14 @@ extern "C" { #elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) - #include + #include /* int64_t */ /** Type for "high precision absolute time". */ typedef int64_t hptime_t; - #define HPTIME_TICKS_PER_SECOND 1000000LL - #define HPTIME_TICKS_PER_MILLISEC 1000LL - #define HPTIME_TICKS_PER_MICRO 1LL + #define HPTIME_TICKS_PER_SECOND ((hptime_t)1000000LL) + #define HPTIME_TICKS_PER_MILLISEC ((hptime_t)1000LL) + #define HPTIME_TICKS_PER_MICRO ((hptime_t)1LL) #else /* !__unix__ */ #error OS dependent support code missing for this OS -- 2.25.1