From d84171dd30771401787450582bbd57aab7aafc4e Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 16 Jul 2002 23:24:54 +0000
Subject: [PATCH] hpux-updates-20020716

get us closer to building
---
 src/afs/HPUX/osi_machdep.h       | 3 +++
 src/afs/HPUX/osi_vnodeops.c      | 4 ----
 src/config/param.hp_ux110.h      | 4 ++++
 src/libafs/MakefileProto.HPUX.in | 2 +-
 src/rx/HPUX/rx_kmutex.h          | 4 +++-
 src/rx/rx_kcommon.c              | 1 -
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h
index edc948d309..e2674bbee8 100644
--- a/src/afs/HPUX/osi_machdep.h
+++ b/src/afs/HPUX/osi_machdep.h
@@ -87,6 +87,9 @@ extern void       afsHashRelease(tid_t key);
 extern caddr_t kmem_alloc();
 #include <sys/kthread_iface.h>	/* for kt_cred() */
 
+/* Expected to be available as a patch from HP */
+#include <vfs_vm.h>
+
 #endif /* _OSI_MACHDEP_H_ */
 
 
diff --git a/src/afs/HPUX/osi_vnodeops.c b/src/afs/HPUX/osi_vnodeops.c
index 86de8e4f65..cafe4b5e4f 100644
--- a/src/afs/HPUX/osi_vnodeops.c
+++ b/src/afs/HPUX/osi_vnodeops.c
@@ -179,10 +179,6 @@ afs_lockf( vp, flag, len, cred, fp, LB, UB )
 #include "../h/tuneable.h"
 #include "../h/buf.h"
 #include "../netinet/in.h"
-#include "../rpc/types.h"
-#include "../rpc/auth.h"
-#include "../rpc/clnt.h"
-#include "../rpc/xdr.h"
 
 /* a freelist of one */
 struct buf *afs_bread_freebp = 0;
diff --git a/src/config/param.hp_ux110.h b/src/config/param.hp_ux110.h
index 7af67ffc79..cb5fc78ae4 100644
--- a/src/config/param.hp_ux110.h
+++ b/src/config/param.hp_ux110.h
@@ -80,6 +80,10 @@
  * supress the warnings.
  */
 struct uio;
+
+#define memset(A, B, S) bzero(A, S)
+#define memcpy(B, A, S) bcopy(A, B, S)
+#define memcmp(A, B, S) bcmp(A, B, S)
 #endif
 #endif /* KERNEL */
 #define	AFS_DIRENT	
diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in
index 348db3c42e..379c6e7917 100644
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -102,7 +102,7 @@ setup:
 
 # Compile the clients.
 ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
-	if false; then \
+	if true; then \
 	for b in $(BITS); do \
 	    for t in $(KOBJ); do \
 		dir=$$t.$$b; \
diff --git a/src/rx/HPUX/rx_kmutex.h b/src/rx/HPUX/rx_kmutex.h
index c5bc1e47f7..459d04a59b 100644
--- a/src/rx/HPUX/rx_kmutex.h
+++ b/src/rx/HPUX/rx_kmutex.h
@@ -2,6 +2,8 @@
 #define _RX_KMUTEX_H_
 #include <sys/spinlock.h>
 #include <sys/sem_sync.h>
+#include <sys/ksleep.h>
+#include <net/netmp.h>
 
 #define RX_ENABLE_LOCKS         1
 extern lock_t*  rx_sleepLock;
@@ -31,5 +33,5 @@ typedef caddr_t afs_kcondvar_t;
 #define MUTEX_TRYENTER(a) 1
 #define MUTEX_EXIT(a)  
 #define MUTEX_INIT(a,b,c,d) 
-/* #define MUTEX_ISMINE(a) */
+#define MUTEX_ISMINE(a) (1)
 #endif
diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index da117bd3ce..42bee20912 100644
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -21,7 +21,6 @@ RCSID("$Header$");
 #ifdef AFS_HPUX110_ENV
 #include "../h/tihdr.h"
 #include <xti.h>
-#include "../afs/hpux_110.h"
 #endif
 #include "../afsint/afsint.h"