svn commit: r297260 - stable/9/include/rpc

[Pedro F. Giffuni]

Author: pfg
Date: Fri Mar 25 00:40:04 2016
New Revision: 297260
URL: https://svnweb.freebsd.org/changeset/base/297260

Log:
  MFC r296394:
  xdr: Fix xdr_rpc* defines.
  
  The defines for xdr_rpc* in xdr.h are wrong. It could be
  very well that Solaris did strip the '_t' from xdr_u_int32_t,
  but Solaris has a xdr_u_int32 function, we don't have this.
  So all of this defines will lead to an unresolved symbol.
  
  This explains why we do not use these functions in FreeBSD
  while they are used in Illumos/Solaris.
  
  Obtained from:	linux libtirpc (git 7864122e61ffe4db1aa8ace89117358a1e3a391b)

Modified:
  stable/9/include/rpc/xdr.h
Directory Properties:
  stable/9/include/   (props changed)

Modified: stable/9/include/rpc/xdr.h
==============================================================================
--- stable/9/include/rpc/xdr.h	Fri Mar 25 00:39:01 2016	(r297259)
+++ stable/9/include/rpc/xdr.h	Fri Mar 25 00:40:04 2016	(r297260)
@@ -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.