From: Miro Jurisic <meeroh@mit.edu>
Date: Wed, 9 Jun 1999 17:47:34 +0000 (+0000)
Subject: #ifdefed Mac native microseconds code for PPC-only
X-Git-Tag: krb5-1.1-beta1~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=461b4de2e7531111c1da1b30bd38a20c3918f20d;p=krb5.git

#ifdefed Mac native microseconds code for PPC-only

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11503 dc483132-0cff-0310-8789-dd5450dbe970
---

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,3 +1,8 @@
+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
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? */