summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-03-06 04:13:17 +0000
committergjb <gjb@FreeBSD.org>2016-03-06 04:13:17 +0000
commitf4bd2481be4a57485def5a36b1489879e5d7a470 (patch)
tree7e556653474c7cbaf439c575734d098129e88b2b /include
parent7f622b840367101a59fea39a608e273d9e888eae (diff)
parentffbdd975f04fc5e43744acfd92c1e69c6e4dbb14 (diff)
downloadFreeBSD-src-f4bd2481be4a57485def5a36b1489879e5d7a470.zip
FreeBSD-src-f4bd2481be4a57485def5a36b1489879e5d7a470.tar.gz
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'include')
-rw-r--r--include/rpc/svc.h1
-rw-r--r--include/rpc/xdr.h14
2 files changed, 6 insertions, 9 deletions
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index f5652fc..53b1815 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -89,6 +89,7 @@ enum xprt_stat {
*/
typedef struct __rpc_svcxprt {
int xp_fd;
+#define xp_sock xp_fd
u_short xp_port; /* associated port number */
const struct xp_ops {
/* receive incoming requests */
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 9456f70..93f1ee4 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -219,15 +219,11 @@ xdr_putint32(XDR *xdrs, int32_t *ip)
(*(xdrs)->x_ops->x_control)(xdrs, req, op)
#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
-/*
- * Solaris strips the '_t' from these types -- not sure why.
- * But, let's be compatible.
- */
-#define xdr_rpcvers(xdrs, versp) xdr_u_int32(xdrs, versp)
-#define xdr_rpcprog(xdrs, progp) xdr_u_int32(xdrs, progp)
-#define xdr_rpcproc(xdrs, procp) xdr_u_int32(xdrs, procp)
-#define xdr_rpcprot(xdrs, protp) xdr_u_int32(xdrs, protp)
-#define xdr_rpcport(xdrs, portp) xdr_u_int32(xdrs, portp)
+#define xdr_rpcvers(xdrs, versp) xdr_u_int32_t(xdrs, versp)
+#define xdr_rpcprog(xdrs, progp) xdr_u_int32_t(xdrs, progp)
+#define xdr_rpcproc(xdrs, procp) xdr_u_int32_t(xdrs, procp)
+#define xdr_rpcprot(xdrs, protp) xdr_u_int32_t(xdrs, protp)
+#define xdr_rpcport(xdrs, portp) xdr_u_int32_t(xdrs, portp)
/*
* Support struct for discriminated unions.
OpenPOWER on IntegriCloud