diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-03-06 04:13:17 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-03-06 04:13:17 +0000 |
| commit | b655ec9752ee1da47110c5f0dacc0003ca55a7ad (patch) | |
| tree | 7e556653474c7cbaf439c575734d098129e88b2b /include | |
| parent | 42d27ee34321c280015bccd973ebb0662b663267 (diff) | |
| parent | 13f28d969a91b4abe8ca0e767a7e293077860b16 (diff) | |
Notes
Diffstat (limited to 'include')
| -rw-r--r-- | include/rpc/svc.h | 1 | ||||
| -rw-r--r-- | include/rpc/xdr.h | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/include/rpc/svc.h b/include/rpc/svc.h index f5652fcb164c1..53b1815bd0b02 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 9456f70c19d6e..93f1ee493b46b 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. |