obsd-glock-decl-20051115

[openafs.git] / src / afs / OBSD / osi_machdep.h

diff --git a/src/afs/OBSD/osi_machdep.h b/src/afs/OBSD/osi_machdep.h
index 3bd3af5..16c9b26 100644 (file)
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -63,13 +63,12 @@ extern struct simplelock afs_rxglobal_lock;
 #define        AFS_PROC        struct proc
 #define        AFS_UCRED       ucred
 #define afs_suser(x)   afs_osi_suser(osi_curcred())
-#define getpid()       (curproc->p_pid)
+#define getpid()       curproc
 #define osi_curcred()  (curproc->p_cred->pc_ucred)
 #define osi_curproc()  curproc
 #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)
@@ -128,7 +127,7 @@ extern struct lock afs_global_lock;
     } while(0)
 #define ISAFS_GLOCK() (afs_global_owner == curproc && curproc)
 #else
-extern struct simplelock afs_global_lock;
+extern struct lock afs_global_lock;
 #define AFS_GLOCK()
 #define AFS_GUNLOCK()
 #define AFS_ASSERT_GLOCK()