diff options
| author | Miro Jurisic <meeroh@mit.edu> | 1999-06-09 17:47:34 +0000 |
|---|---|---|
| committer | Miro Jurisic <meeroh@mit.edu> | 1999-06-09 17:47:34 +0000 |
| commit | 461b4de2e7531111c1da1b30bd38a20c3918f20d (patch) | |
| tree | 8de4c9c8266f58a8b417b628938a3593835e416b /src | |
| parent | c7b87ddf57181a0339a343e985f8e467d86408d4 (diff) | |
| download | krb5-461b4de2e7531111c1da1b30bd38a20c3918f20d.tar.gz krb5-461b4de2e7531111c1da1b30bd38a20c3918f20d.tar.xz krb5-461b4de2e7531111c1da1b30bd38a20c3918f20d.zip | |
#ifdefed Mac native microseconds code for PPC-only
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11503 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/os/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/krb5/os/c_ustime.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 1771da98f..7ef108f58 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,5 +1,10 @@ 1999-06-09 Miro Jurisic <meeroh@mit.edu> + * c_ustime.c (krb5_crypto_us_timeofday): #ifdefed microseconds on Mac to be + PPC-only + +1999-06-09 Miro Jurisic <meeroh@mit.edu> + * c_ustime.c (AbsoluteToSecsNanosecs): Fixed the UInt64 division * c_ustime.c (krb5_crypto_us_timeofday): now returning the correct value diff --git a/src/lib/krb5/os/c_ustime.c b/src/lib/krb5/os/c_ustime.c index 85197f1d2..9da60f3b8 100644 --- a/src/lib/krb5/os/c_ustime.c +++ b/src/lib/krb5/os/c_ustime.c @@ -41,6 +41,7 @@ * Macintosh ooperating system interface for Kerberos. */ +#include <ConditionalMacros.h> #include <script.h> /* Defines MachineLocation, used by getTimeZoneOffset */ #include <ToolUtils.h> /* Defines BitTst(), called by getTimeZoneOffset() */ #include <OSUtils.h> /* Defines GetDateTime */ @@ -109,7 +110,8 @@ krb5_crypto_us_timeofday(seconds, microseconds) sec = the_time - ((66 * 365 * 24 * 60 * 60) + (17 * 24 * 60 * 60) + (getTimeZoneOffset() * 60 * 60)); - + +#ifdef TARGET_CPU_PPC /* Only PPC has accurate time */ if (HaveAccurateTime ()) { /* Does hardware support accurate time? */ AbsoluteTime absoluteTime; @@ -120,7 +122,9 @@ krb5_crypto_us_timeofday(seconds, microseconds) usec = nanoseconds / 1000; - } else { + } else +#endif /* TARGET_CPU_PPC */ + { usec = 0; if (sec == last_sec) { /* Same as last time? */ |