From: Nathan Neulinger <nneul@umr.edu>
Date: Thu, 14 Nov 2002 20:30:19 +0000 (+0000)
Subject: make the hpux client work
X-Git-Tag: openafs-stable-1_2_8~55
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=60639e6c8e95cc65ea3de2a45810d3728a1d09f6;p=packages%2Fo%2Fopenafs.git

make the hpux client work


(cherry picked from commit aab137dc718178a7648b2360a131861ccbba1121)
---

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index bb267c7fe..777f02e83 100644
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -30,7 +30,7 @@ typedef struct socket *osi_socket;
 
 extern osi_socket rxi_GetUDPSocket();
 
-#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS)) || (defined(AFS_HPUX_ENV) && !defined(RX_ENABLE_LOCKS))
+#if (!defined(AFS_GLOBAL_SUNLOCK) && !defined(RX_ENABLE_LOCKS)
 #define	osi_rxSleep(a)	afs_osi_Sleep(a)
 #define	osi_rxWakeup(a)	afs_osi_Wakeup(a)
 #endif
diff --git a/src/rx/xdr.h b/src/rx/xdr.h
index 686974509..5f899ac4a 100644
--- a/src/rx/xdr.h
+++ b/src/rx/xdr.h
@@ -171,14 +171,14 @@ typedef	bool_t (*xdrproc_t)();
 typedef struct {
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	struct xdr_ops {
-#if defined(AFS_SGI61_ENV) && defined(KERNEL) && (_MIPS_SZLONG != _MIPS_SZINT)
+#if defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV))
 /* NOTE: SGI 6.1 adds two routines to the xdr_ops if the size of a long is
  * 64 bits. I've only done this for the kernel, since other changes may
  * be necessary if we make a 64 bit user version of AFS.
  */
 		bool_t	(*x_getint64)(); /* get 32 bits into a long */
 		bool_t	(*x_putint64)(); /* send 32 bits of a long */
-#endif /* AFS_SGI61_ENV */
+#endif /* defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV)) */
 #if !(defined(KERNEL) && defined(AFS_SUN57_ENV))
 		bool_t	(*x_getint32)();	/* get an afs_int32 from underlying stream */
 		bool_t	(*x_putint32)();	/* put an afs_int32 to " */
@@ -210,7 +210,7 @@ typedef struct {
  * u_int	 len;
  * u_int	 pos;
  */
-#if defined(AFS_SGI61_ENV) && defined(KERNEL) && (_MIPS_SZLONG != _MIPS_SZINT)
+#if defined(AFS_SGI61_ENV) && defined(KERNEL) && (_MIPS_SZLONG != _MIPS_SZINT) || defined(AFS_HPUX_64BIT_ENV)
 #define XDR_GETINT64(xdrs, int64p)			\
 	(*(xdrs)->x_ops->x_getint64)(xdrs, int64p)
 #define xdr_getint64(xdrs, int64p)			\
@@ -220,7 +220,7 @@ typedef struct {
 	(*(xdrs)->x_ops->x_putint64)(xdrs, int64p)
 #define xdr_putint64(xdrs, int64p)			\
 	(*(xdrs)->x_ops->x_putint64)(xdrs, int64p)
-#endif /* defined(AFS_SGI61_ENV) && KERNEL && (_MIPS_SZLONG != _MIPS_SZINT) */
+#endif /* defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV)) */
 
 #define XDR_GETINT32(xdrs, int32p)			\
 	(*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index 5ef8876b5..61ea11e74 100644
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -102,11 +102,11 @@ void		xdrrx_destroy();
  * Ops vector for stdio type XDR
  */
 static struct xdr_ops	xdrrx_ops = {
-#if (defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV)
+#if defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV))
 	xdrrx_getint64,
 	xdrrx_putint64,
-#endif /* (defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV) */
-#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) && !defined(AFS_HPUX_64BIT_ENV)
+#endif /* defined(KERNEL) && ((defined(AFS_SGI61_ENV) && (_MIPS_SZLONG != _MIPS_SZINT)) || defined(AFS_HPUX_64BIT_ENV)) */
+#if !(defined(KERNEL) && defined(AFS_SUN57_ENV)) 
 	xdrrx_getint32,	/* deserialize an afs_int32 */
 	xdrrx_putint32,	/* serialize an afs_int32 */
 #endif