X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.c;h=57ccf34df46462c52fa6657a199558f5e47b30d7;hb=0c154bc0927a32f77467f32aac3cc3507baa97ca;hp=e4016d1b55ae561a886bb0e7270f4c1ac97bb780;hpb=087d99a956f41f5e1c62116a0e88a4f6c8c0f718;p=bertos.git diff --git a/os/hptime.c b/os/hptime.c index e4016d1b..57ccf34d 100755 --- a/os/hptime.c +++ b/os/hptime.c @@ -2,7 +2,7 @@ * \file * * * \brief Portable abstraction for high-resolution time handling (implementation) @@ -11,18 +11,27 @@ * \author Bernardo Innocenti */ -/* - * $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. - * - */ +/*#* + *#* $Log$ + *#* 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" @@ -47,7 +56,7 @@ hptime_t hptime_get(void) return (((hptime_t)ft.dwHighDateTime) << 32) + (hptime_t)ft.dwLowDateTime; } -#elif defined(__unix__) +#elif defined(__unix__) || defined(__APPLE__) && defined(__MACH__) #include