get us closer to building

(cherry picked from commit d84171dd30771401787450582bbd57aab7aafc4e)

diff --git a/src/afs/HPUX/osi_machdep.h b/src/afs/HPUX/osi_machdep.h
index edc948d309eed05887dd5245fd8ccaec2d06005d..e2674bbee8ff9f1df011f873b8033c0e0493e522 100644 (file)
--- 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 86de8e4f650c37d225bdb1534bd01fc6b569bd8a..cafe4b5e4fa75a0d6a06a18be1ffce332d86716c 100644 (file)
--- 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 7af67ffc792d434ee47f6a7f1c98d735a8a9f1a4..cb5fc78ae4655469a882b262af3ab4d06241d2df 100644 (file)
--- 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 6562701d6f30cfb60ae2ad3bcb618eb072064b75..29830be64c892639b59825b6deafc68f5ba1436c 100644 (file)
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -119,7 +119,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 c5bc1e47f7dc59615ff6ec7d59dc06eb66a02aa3..459d04a59bd4dfafdc13c7bb8c391a1739d595c6 100644 (file)
--- 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 9dee8f6d3c64c3f51942032ea258743a0b0bd9ba..eadc1a38e10843b29b0451cfa4ead9ed5ab6c3b1 100644 (file)
--- 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"