afs: Always define our own osi_timeval32_t

[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 c7af6bc..1179e27 100644 (file)
--- a/src/afs/OBSD/osi_machdep.h
+++ b/src/afs/OBSD/osi_machdep.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000, International Business Machines Corporation and others.
  * All Rights Reserved.
- * 
+ *
  * This software has been released under the terms of the IBM Public
  * License.  For details, see the LICENSE file in the top-level source
  * directory or online at http://www.openafs.org/dl/license10.html
@@ -45,7 +45,6 @@
 /* vnode */
 #define VN_HOLD(vp)    afs_vget((vp), 0)
 #define VN_RELE(vp)    vrele(vp)
-#define osi_vnhold(avc, r) afs_vget(AFSTOV(avc), 0)
 #define va_nodeid      va_fileid
 #define vnode_t                struct vnode
 
@@ -64,20 +63,15 @@ inline void afs_osi_FreeStr(char *x);
 extern void *osi_obsd_Alloc(size_t asize, int cansleep);
 extern void osi_obsd_Free(void *p, size_t asize);
 
-#define afs_osi_Alloc_NoSleep(asize) osi_obsd_Alloc((asize), 0)
-#define afs_osi_Alloc(asize) osi_obsd_Alloc((asize), 1)
-#define afs_osi_FreeStr(s) afs_osi_Free((s), strlen((s)) + 1)
-#define afs_osi_Free(buf, asize) osi_obsd_Free((buf), (asize))
-
 #ifdef AFS_KALLOC
 #undef AFS_KALLOC
-#define AFS_KALLOC(s) osi_obsd_Alloc((s), 1 /* cansleep */)
 #endif
+#define AFS_KALLOC(s) osi_obsd_Alloc((s), 1 /* cansleep */)
 
 #ifdef AFS_KFREE
 #undef AFS_KFREE
-#define AFS_KFREE(p, s) (osi_obsd_Free((p), (s)))
 #endif
+#define AFS_KFREE(p, s) (osi_obsd_Free((p), (s)))
 
 #ifdef AFS_OBSD42_ENV
 /* removed, live with it */
@@ -88,7 +82,7 @@ extern void osi_obsd_Free(void *p, size_t asize);
   free((p), (mflags))
 #else
 #define BSD_KMALLOC MALLOC
-#define BSD_KFREE KFREE
+#define BSD_KFREE FREE
 #endif /* AFS_OBSD42_ENV */
 
 /* proc, cred */
@@ -103,7 +97,6 @@ typedef struct ucred afs_ucred_t;
 
 /* time */
 #define        afs_hz          hz
-#define osi_GetTime(x) microtime(x)
 extern time_t osi_Time();
 
 /* str */
@@ -235,13 +228,27 @@ extern struct lock afs_global_lock;
     } while (0)
 
 /* vnodes */
+#if defined(AFS_OBSD49_ENV)
+extern struct vops afs_vops;
+#define IsAfsVnode(v)      ((v)->v_op == &afs_vops)
+#else
 extern int (**afs_vnodeop_p) ();
+#define IsAfsVnode(v)      ((v)->v_op == afs_vnodeop_p)
+#endif
 #define vType(vc)               AFSTOV(vc)->v_type
 #define vSetVfsp(vc, vfsp)      AFSTOV(vc)->v_mount = (vfsp)
 #define vSetType(vc, type)      AFSTOV(vc)->v_type = (type)
-#define IsAfsVnode(v)      ((v)->v_op == afs_vnodeop_p)
 #define SetAfsVnode(v)     /* nothing; done in getnewvnode() */
 
 #define osi_procname(procname, size) strncpy(procname, curproc->p_comm, size)
 
+static_inline void
+osi_GetTime(osi_timeval32_t *atv)
+{
+    struct timeval now;
+    microtime(&now);
+    atv->tv_sec = now.tv_sec;
+    atv->tv_usec = now.tv_usec;
+}
+
 #endif /* _OSI_MACHDEP_H_ */