From: Jim Rees <rees@umich.edu>
Date: Mon, 23 May 2005 22:17:29 +0000 (+0000)
Subject: STABLE14-obsd-time-20050520
X-Git-Tag: openafs-devel-1_3_83~31
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d53f1d082680d809c7bdbeb172fc4c159c23bc77;p=packages%2Fo%2Fopenafs.git

STABLE14-obsd-time-20050520


Remove extern time from OBSD/osi_machdep.h. It's in sys/kernel.h.
Suggested by irene.braun@ualberta.ca.


(cherry picked from commit c20d9c0eabb6f6186f21e2f5bd7e125c9a9aee37)
---

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 43a118b6c..a72885194 100644
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -69,7 +69,6 @@ extern struct simplelock afs_rxglobal_lock;
 #define p_rcred         p_ucred
 
 /* time */
-extern struct timeval time;
 #define	afs_hz		hz
 #define osi_GetTime(x)	microtime(x)
 #define osi_Time()	(time.tv_sec)
diff --git a/src/rxkad/rxkad_common.c b/src/rxkad/rxkad_common.c
index cf74fac32..ee4c84157 100644
--- a/src/rxkad/rxkad_common.c
+++ b/src/rxkad/rxkad_common.c
@@ -32,7 +32,7 @@ RCSID
 #ifdef	AFS_AIX_ENV
 #include "h/systm.h"
 #endif
-#ifdef AFS_DARWIN60_ENV
+#if defined(AFS_DARWIN60_ENV) || defined(AFS_OBSD_ENV)
 #include "h/kernel.h"
 #endif
 #include "h/types.h"