X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.c;h=57ccf34df46462c52fa6657a199558f5e47b30d7;hb=02fde028c0bf13359b5b1fd993cb99a920ff5786;hp=07b0a30fd4a3eedc9ce66895002e6427705b7974;hpb=f4a24c811a668a072b6688bcdfcd927529977b26;p=bertos.git diff --git a/os/hptime.c b/os/hptime.c index 07b0a30f..57ccf34d 100755 --- a/os/hptime.c +++ b/os/hptime.c @@ -1,8 +1,8 @@ /*! * \file * * * \brief Portable abstraction for high-resolution time handling (implementation) @@ -11,12 +11,27 @@ * \author Bernardo Innocenti */ -/* - * $Log$ - * 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" @@ -41,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