diff --git a/src/ntp/ntp_proto.c b/src/ntp/ntp_proto.c
index 40cb35443e..5c3ada17d3 100644
--- a/src/ntp/ntp_proto.c
+++ b/src/ntp/ntp_proto.c
@@ -184,7 +184,10 @@ extern struct servent *servp;
 extern char *malloc(), *ntoa();
 extern double drift_comp, compliance;	/* logical clock variables */
 extern double s_fixed_to_double(), ul_fixed_to_double();
-extern void make_new_peer(), double_to_s_fixed(), tstamp(), demobilize();
+extern void make_new_peer(), double_to_s_fixed(), demobilize();
+#ifndef AFS_SUN58_ENV
+extern void tstamp();
+#endif
 	
 
 #ifdef	REFCLOCK
diff --git a/src/ntp/ntpsubs.c b/src/ntp/ntpsubs.c
index 28e017a2ed..28bdbf31a5 100644
--- a/src/ntp/ntpsubs.c
+++ b/src/ntp/ntpsubs.c
@@ -233,7 +233,8 @@ double_to_s_fixed(t, value)
 	results in the value 2^31.  Neither 4.2bsd nor VMS have this
 	problem.  Reported it to Bob O'Brien of SMI
 */
-#ifdef	SUN_FLT_BUG
+#ifndef AFS_SUN58_ENV
+#ifdef SUN_FLT_BUG 
 tstamp(stampp, tvp)
 	struct l_fixedpt *stampp;
 	struct timeval *tvp;
@@ -255,6 +256,7 @@ tstamp(stampp, tvp)
 	stampp->fraction = ntohl((afs_uint32) ((float) tvp->tv_usec * 4294.967295));
 }
 #endif
+#endif /* AFS_SUN58_ENV */
 
 /*
  * ntoa is similar to inet_ntoa, but cycles through a set of 8 buffers