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 43a118b6c299445d06931093d87ece89f1928225..a7288519442797bddce7d6ac5db565d3fa53d765 100644 (file)
--- 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 cf74fac32f86e345427671a4d1c71eb22af8f808..ee4c841576114cbf7447b282c3e2397624ff9d1f 100644 (file)
--- 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"