Date: Sun, 2 Sep 2012 14:59:31 -0700 (PDT) From: Pedro Giffuni <pfg@freebsd.org> To: Yuri Pankov <yuri.pankov@gmail.com> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r240060 - in head: include/rpc sys/rpc Message-ID: <1346623171.31494.YahooMailNeo@web113517.mail.gq1.yahoo.com> In-Reply-To: <5043CC95.9090707@gmail.com> References: <201209022104.q82L4eru068961@svn.freebsd.org> <5043CC95.9090707@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Yes, indeed! I will revert most of it.=0A=A0=0AThanks for checking!=0A=A0= =0APedro.=0A=0A=0A>________________________________=0A> From: Yuri Pankov <= yuri.pankov@gmail.com>=0A>To: Pedro F. Giffuni <pfg@freebsd.org> =0A>Cc: sr= c-committers@freebsd.org; svn-src-all@freebsd.org; svn-src-head@freebsd.org= =0A>Sent: Sunday, September 2, 2012 4:16 PM=0A>Subject: Re: svn commit: r2= 40060 - in head: include/rpc sys/rpc=0A> =0A>On Sun, 2 Sep 2012 21:04:40 += 0000 (UTC), Pedro F. Giffuni wrote:=0A>> Author: pfg=0A>> Date: Sun Sep=A0 = 2 21:04:40 2012=0A>> New Revision: 240060=0A>> URL: http://svn.freebsd.org/= changeset/base/240060=0A>>=0A>> Log:=0A>>=A0 =A0 Fix RPC headers for C++=0A= >>=0A>>=A0 =A0 C++ mangling will cause trouble with variables like __rpc_xd= r=0A>>=A0 =A0 in xdr.h so rename this to XDR.=0A>>=A0 =A0 While here add pr= oper C++ guards to RPC headers.=0A>>=0A>>=A0 =A0 PR:=A0=A0=A0 =A0=A0=A0 137= 443=0A>>=A0 =A0 MFC after:=A0=A0=A0 2 weeks=0A>>=0A>> Modified:=0A>>=A0 =A0= head/include/rpc/auth.h=0A>>=A0 =A0 head/include/rpc/auth_unix.h=0A>>=A0 = =A0 head/include/rpc/clnt.h=0A>>=A0 =A0 head/include/rpc/clnt_soc.h=0A>>=A0= =A0 head/include/rpc/des_crypt.h=0A>>=A0 =A0 head/include/rpc/nettype.h=0A= >>=A0 =A0 head/include/rpc/pmap_clnt.h=0A>>=A0 =A0 head/include/rpc/pmap_rm= t.h=0A>>=A0 =A0 head/include/rpc/rpc_com.h=0A>>=A0 =A0 head/include/rpc/rpc= _msg.h=0A>>=A0 =A0 head/include/rpc/rpcb_clnt.h=0A>>=A0 =A0 head/include/rp= c/rpcent.h=0A>>=A0 =A0 head/include/rpc/rpcsec_gss.h=0A>>=A0 =A0 head/inclu= de/rpc/svc.h=0A>>=A0 =A0 head/include/rpc/svc_soc.h=0A>>=A0 =A0 head/includ= e/rpc/xdr.h=0A>>=A0 =A0 head/sys/rpc/rpc_com.h=0A>>=A0 =A0 head/sys/rpc/xdr= .h=0A>>=0A>> Modified: head/include/rpc/auth.h=0A>> =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- he= ad/include/rpc/auth.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059= )=0A>> +++ head/include/rpc/auth.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0= =A0=A0 (r240060)=0A>> @@ -51,6 +51,10 @@=0A>>=A0 #include <sys/cdefs.h>=0A= >>=A0 #include <sys/socket.h>=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> = +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 #define MAX_AUTH_BYTES=A0=A0=A0 = 400=0A>>=A0 #define MAXNETNAMELEN=A0=A0=A0 255=A0=A0=A0 /* maximum length = of network user's name */=0A>>=0A>> @@ -366,4 +370,8 @@ __END_DECLS=0A>>=A0= #define=A0=A0=A0 RPCSEC_GSS_KRB5I=A0=A0=A0 390004=0A>>=A0 #define=A0=A0= =A0 RPCSEC_GSS_KRB5P=A0=A0=A0 390005=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus= =0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_AUTH_H */=0A>>=0A>> M= odified: head/include/rpc/auth_unix.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/includ= e/rpc/auth_unix.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A= >> +++ head/include/rpc/auth_unix.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0= =A0=A0 (r240060)=0A>> @@ -48,6 +48,10 @@=0A>>=A0 #define _RPC_AUTH_UNIX_H= =0A>>=A0 #include <sys/cdefs.h>=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>= > +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 /* The machine name is part of= a credential; it may not exceed 255 bytes */=0A>>=A0 #define MAX_MACHINE_= NAME 255=0A>>=0A>> @@ -81,4 +85,8 @@ struct short_hand_verf {=0A>>=A0 =A0= =A0=A0 struct opaque_auth new_cred;=0A>>=A0 };=0A>>=0A>> +#ifdef=A0=A0=A0 = __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_AUTH_UNIX_= H */=0A>>=0A>> Modified: head/include/rpc/clnt.h=0A>> =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- he= ad/include/rpc/clnt.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059= )=0A>> +++ head/include/rpc/clnt.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0= =A0=A0 (r240060)=0A>> @@ -64,6 +64,10 @@=0A>>=A0 #include <netconfig.h>=0A= >>=A0 #include <sys/un.h>=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +ext= ern "C" {=0A>> +#endif=0A>> +=0A>>=A0 /*=0A>>=A0 =A0 * Well-known IPV6 RPC= broadcast address.=0A>>=A0 =A0 */=0A>> @@ -551,6 +555,10 @@ extern enum cl= nt_stat rpc_broadcast_exp(=0A>>=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0= =A0=A0=A0 const int, const char *);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef= =A0=A0=A0 __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 /* For backward = compatibility */=0A>>=A0 #include <rpc/clnt_soc.h>=0A>>=0A>>=0A>> Modified= : head/include/rpc/clnt_soc.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/include/rpc/cln= t_soc.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ hea= d/include/rpc/clnt_soc.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r240= 060)=0A>> @@ -49,6 +49,10 @@=0A>>=0A>>=A0 #include <sys/cdefs.h>=0A>>=0A>>= +#ifdef=A0=A0=A0 __cplusplus=0A>> +extern "C" {=0A>> +#endif=0A>> +=0A>>= =A0 #define UDPMSGSIZE=A0 =A0 =A0 8800=A0 =A0 /* rpc imposed limit on udp = msg size */=0A>>=0A>>=A0 /*=0A>> @@ -103,4 +107,8 @@ extern CLIENT *clntud= p_bufcreate(struct=0A>>=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 =A0=A0=A0 struct= timeval, int *, u_int, u_int);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0= =A0=A0 __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* _RPC_CLNT= _SOC_H */=0A>>=0A>> Modified: head/include/rpc/des_crypt.h=0A>> =3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =0A>> --- head/include/rpc/des_crypt.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012= =A0=A0=A0 (r240059)=0A>> +++ head/include/rpc/des_crypt.h=A0=A0=A0 Sun Sep= =A0 2 21:04:40 2012=A0=A0=A0 (r240060)=0A>> @@ -47,6 +47,10 @@=0A>>=A0 #in= clude <sys/cdefs.h>=0A>>=A0 #include <rpc/rpc.h>=0A>>=0A>> +#ifdef=A0=A0= =A0 __cplusplus=0A>> +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 #define DES= _MAXDATA 8192=A0=A0=A0 /* max bytes encrypted in one call */=0A>>=A0 #defi= ne DES_DIRMASK (1 << 0)=0A>>=A0 #define DES_ENCRYPT (0*DES_DIRMASK)=A0=A0= =A0 /* Encrypt */=0A>> @@ -103,4 +107,8 @@ __BEGIN_DECLS=0A>>=A0 void des_= setparity( char *);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 __cplus= plus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif=A0 /* _DES_DES_CRYPT_H */= =0A>>=0A>> Modified: head/include/rpc/nettype.h=0A>> =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- he= ad/include/rpc/nettype.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240= 059)=0A>> +++ head/include/rpc/nettype.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 201= 2=A0=A0=A0 (r240060)=0A>> @@ -44,6 +44,10 @@=0A>>=0A>>=A0 #include <netcon= fig.h>=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +extern "C" {=0A>> +#end= if=0A>> +=0A>>=A0 #define=A0=A0=A0 _RPC_NONE=A0=A0=A0 0=0A>>=A0 #define= =A0=A0=A0 _RPC_NETPATH=A0=A0=A0 1=0A>>=A0 #define=A0=A0=A0 _RPC_VISIBLE=A0= =A0=A0 2=0A>> @@ -61,4 +65,8 @@ extern struct netconfig *__rpc_getconf(v=0A= >>=A0 extern struct netconfig *__rpc_getconfip(const char *);=0A>>=A0 __E= ND_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +}=0A>> +#endif=0A>> += =0A>>=A0 #endif=A0=A0=A0 /* !_RPC_NETTYPE_H */=0A>>=0A>> Modified: head/in= clude/rpc/pmap_clnt.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/include/rpc/pmap_clnt.h= =A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ head/inclu= de/rpc/pmap_clnt.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r240060)= =0A>> @@ -66,6 +66,10 @@=0A>>=A0 #define _RPC_PMAP_CLNT_H_=0A>>=A0 #inclu= de <sys/cdefs.h>=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +extern "C" {= =0A>> +#endif=0A>> +=0A>>=A0 __BEGIN_DECLS=0A>>=A0 extern bool_t=A0=A0=A0= =A0=A0=A0 pmap_set(u_long, u_long, int, int);=0A>>=A0 extern bool_t=A0=A0= =A0 =A0=A0=A0 pmap_unset(u_long, u_long);=0A>> @@ -83,4 +87,8 @@ extern u_s= hort=A0=A0=A0 =A0=A0=A0 pmap_getport(struct sock=0A>>=A0 =A0=A0=A0 =A0=A0= =A0 =A0=A0=A0 =A0=A0=A0 =A0 =A0 u_long, u_long, u_int);=0A>>=A0 __END_DEC= LS=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>= =A0 #endif /* !_RPC_PMAP_CLNT_H_ */=0A>>=0A>> Modified: head/include/rpc/p= map_rmt.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/include/rpc/pmap_rmt.h=A0=A0=A0 Sun = Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ head/include/rpc/pmap_rm= t.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r240060)=0A>> @@ -44,6 +4= 4,10 @@=0A>>=A0 #define _RPC_PMAP_RMT_H=0A>>=A0 #include <sys/cdefs.h>=0A= >>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +extern "C" {=0A>> +#endif=0A>> += =0A>>=A0 struct rmtcallargs {=0A>>=A0 =A0=A0=A0 u_long prog, vers, proc, = arglen;=0A>>=A0 =A0=A0=A0 caddr_t args_ptr;=0A>> @@ -62,4 +66,8 @@ extern = bool_t xdr_rmtcall_args(XDR *, st=0A>>=A0 extern bool_t xdr_rmtcallres(XDR= *, struct rmtcallres *);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 _= _cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_PMAP_RMT_H = */=0A>>=0A>> Modified: head/include/rpc/rpc_com.h=0A>> =3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> ---= head/include/rpc/rpc_com.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r= 240059)=0A>> +++ head/include/rpc/rpc_com.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 = 2012=A0=A0=A0 (r240060)=0A>> @@ -42,9 +42,13 @@=0A>>=A0 #ifndef _RPC_RPCCO= M_H=0A>>=A0 #define=A0=A0=A0 _RPC_RPCCOM_H=0A>>=0A>> +/* #pragma ident=A0= =A0=A0 "@(#)rpc_com.h=A0=A0=A0 1.11=A0=A0=A0 93/07/05 SMI" */=0A>> +=0A>>= =A0 #include <sys/cdefs.h>=0A>>=0A>> -/* #pragma ident=A0=A0=A0 "@(#)rpc_c= om.h=A0=A0=A0 1.11=A0=A0=A0 93/07/05 SMI" */=0A>> +#ifdef __cplusplus=0A>> = +extern "C" {=0A>> +#endif=0A>>=0A>>=A0 /*=0A>>=A0 =A0 * The max size of t= he transport, if the size cannot be determined=0A>> @@ -80,4 +84,8 @@ char = *_get_next_token(char *, int);=0A>>=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef = __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* _RPC_RPCCOM_H */= =0A>>=0A>> Modified: head/include/rpc/rpc_msg.h=0A>> =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- he= ad/include/rpc/rpc_msg.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240= 059)=0A>> +++ head/include/rpc/rpc_msg.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 201= 2=A0=A0=A0 (r240060)=0A>> @@ -43,6 +43,10 @@=0A>>=A0 #ifndef _RPC_RPC_MSG_= H=0A>>=A0 #define _RPC_RPC_MSG_H=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A= >> +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 #define RPC_MSG_VERSION=A0=A0= =A0 =A0=A0=A0 ((u_int32_t) 2)=0A>>=A0 #define RPC_SERVICE_PORT=A0=A0=A0 ((= u_short) 2048)=0A>>=0A>> @@ -211,4 +215,8 @@ extern bool_t=A0=A0=A0 xdr_rej= ected_reply(XDR *,=0A>>=A0 extern void=A0=A0=A0 _seterr_reply(struct rpc_m= sg *, struct rpc_err *);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 __= cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_RPC_MSG_H */= =0A>>=0A>> Modified: head/include/rpc/rpcb_clnt.h=0A>> =3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> ---= head/include/rpc/rpcb_clnt.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 = (r240059)=0A>> +++ head/include/rpc/rpcb_clnt.h=A0=A0=A0 Sun Sep=A0 2 21:04= :40 2012=A0=A0=A0 (r240060)=0A>> @@ -61,6 +61,10 @@=0A>>=A0 #include <rpc/= types.h>=0A>>=A0 #include <rpc/rpcb_prot.h>=0A>>=0A>> +#ifdef=A0=A0=A0 __c= plusplus=0A>> +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 __BEGIN_DECLS=0A>>= =A0 extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,=0A>>=A0 =A0= =A0=A0 =A0=A0=A0 =A0 =A0 =A0 const struct netconfig=A0 *, const struct net= buf *);=0A>> @@ -82,4 +86,8 @@ extern char *rpcb_taddr2uaddr(struct net=0A>= >=A0 extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *);= =0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +}=0A>> += #endif=0A>> +=0A>>=A0 #endif=A0=A0=A0 /* !_RPC_RPCB_CLNT_H */=0A>>=0A>> Mo= dified: head/include/rpc/rpcent.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/include/rpc/= rpcent.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ he= ad/include/rpc/rpcent.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r2400= 60)=0A>> @@ -45,6 +45,9 @@=0A>>=A0 /*=A0=A0=A0 #pragma ident "@(#)rpcent.h= =A0 1.13=A0 =A0 94/04/25 SMI"=A0=A0=A0 */=0A>>=A0 /*=A0 =A0 =A0 @(#)rpcen= t.h 1.1 88/12/06 SMI=A0 */=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +ex= tern "C" {=0A>> +#endif=0A>>=0A>>=A0 struct rpcent {=0A>>=A0 =A0 =A0 =A0 = char=A0 =A0 *r_name;=A0 =A0 =A0 =A0 /* name of server for this rpc program = */=0A>> @@ -64,4 +67,8 @@ extern void setrpcent(int);=0A>>=A0 extern void = endrpcent(void);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplu= s=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_CENT_H */=0A>>=0A>> = Modified: head/include/rpc/rpcsec_gss.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/includ= e/rpc/rpcsec_gss.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)= =0A>> +++ head/include/rpc/rpcsec_gss.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012= =A0=A0=A0 (r240060)=0A>> @@ -29,6 +29,10 @@=0A>>=A0 #ifndef _RPCSEC_GSS_H= =0A>>=A0 #define _RPCSEC_GSS_H=0A>>=0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>>= +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 #include <gssapi/gssapi.h>=0A>>= =0A>>=A0 #ifndef MAX_GSS_MECH=0A>> @@ -176,4 +180,8 @@ bool_t __rpc_gss_se= t_error(int rpc_gss_e=0A>>=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0=A0=A0 = __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPCSEC_GSS_H *= /=0A>>=0A>> Modified: head/include/rpc/svc.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/= include/rpc/svc.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A= >> +++ head/include/rpc/svc.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 = (r240060)=0A>> @@ -65,6 +65,10 @@=0A>>=A0 =A0 * parameters, struct svc_req = * and SVCXPRT *, defined below.=0A>>=A0 =A0 */=0A>>=0A>> +#ifdef=A0=A0=A0 _= _cplusplus=0A>> +extern "C" {=0A>> +#endif=0A>> +=0A>>=A0 /*=0A>>=A0 =A0 *= =A0 =A0 =A0 Service control requests=0A>>=A0 =A0 */=0A>> @@ -467,6 +471,9 @= @ int __rpc_get_local_uid(SVCXPRT *_transp=0A>>=0A>>=A0 __END_DECLS=0A>>= =0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +}=0A>> +#endif=0A>>=0A>>=A0 /* fo= r backward compatibility */=0A>>=A0 #include <rpc/svc_soc.h>=0A>>=0A>> Mod= ified: head/include/rpc/svc_soc.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/include/rpc/= svc_soc.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ h= ead/include/rpc/svc_soc.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r24= 0060)=0A>> @@ -49,6 +49,10 @@=0A>>=A0 =A0 * with TS-RPC=0A>>=A0 =A0 */=0A>>= =0A>> +#ifdef=A0=A0=A0 __cplusplus=0A>> +extern "C" {=0A>> +#endif=0A>> += =0A>>=A0 /*=0A>>=A0 =A0 *=A0 Approved way of getting address of caller=0A>= >=A0 =A0 */=0A>> @@ -113,4 +117,8 @@ __BEGIN_DECLS=0A>>=A0 extern SVCXPRT = *svcfd_create(int, u_int, u_int);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef=A0= =A0=A0 __cplusplus=0A>> +}=0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_SVC= _SOC_H */=0A>>=0A>> Modified: head/include/rpc/xdr.h=0A>> =3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> = --- head/include/rpc/xdr.h=A0=A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r2= 40059)=0A>> +++ head/include/rpc/xdr.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012= =A0=A0=A0 (r240060)=0A>> @@ -43,6 +43,10 @@=0A>>=A0 #define _RPC_XDR_H=0A>= >=A0 #include <sys/cdefs.h>=0A>>=0A>> +#ifdef __cplusplus=0A>> +extern "C"= {=0A>> +#endif=0A>> +=0A>>=A0 /*=0A>>=A0 =A0 * XDR provides a conventiona= l way for converting between C data=0A>>=A0 =A0 * types and an external bit= -string representation.=A0 Library supplied=0A>> @@ -97,26 +101,26 @@ enum = xdr_op {=0A>>=A0 =A0 * an operations vector for the particular implementati= on (e.g. see xdr_mem.c),=0A>>=A0 =A0 * and two private fields for the use o= f the particular implementation.=0A>>=A0 =A0 */=0A>> -typedef struct __rpc_= xdr {=0A>> +typedef struct XDR {=0A>>=A0 =A0=A0=A0 enum xdr_op=A0=A0=A0 x_= op;=A0=A0=A0 =A0=A0=A0 /* operation; fast additional param */=0A>>=A0 =A0= =A0=A0 const struct xdr_ops {=0A>>=A0 =A0=A0=A0 =A0=A0=A0 /* get a long fr= om underlying stream */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_getlo= ng)(struct __rpc_xdr *, long *);=0A>> +=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 = (*x_getlong)(struct XDR *, long *);=0A>>=A0 =A0=A0=A0 =A0=A0=A0 /* put a l= ong to " */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_putlong)(struct _= _rpc_xdr *, const long *);=0A>> +=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_pu= tlong)(struct XDR *, const long *);=0A>>=A0 =A0=A0=A0 =A0=A0=A0 /* get som= e bytes from " */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_getbytes)(s= truct __rpc_xdr *, char *, u_int);=0A>> +=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0= =A0 (*x_getbytes)(struct XDR *, char *, u_int);=0A>>=A0 =A0=A0=A0 =A0=A0= =A0 /* put some bytes to " */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x= _putbytes)(struct __rpc_xdr *, const char *, u_int);=0A>> +=A0=A0=A0 =A0=A0= =A0 bool_t=A0=A0=A0 (*x_putbytes)(struct XDR *, const char *, u_int);=0A>>= =A0 =A0=A0=A0 =A0=A0=A0 /* returns bytes off from beginning */=0A>> -=A0= =A0=A0 =A0=A0=A0 u_int=A0=A0=A0 (*x_getpostn)(struct __rpc_xdr *);=0A>> += =A0=A0=A0 =A0=A0=A0 u_int=A0=A0=A0 (*x_getpostn)(struct XDR *);=0A>>=A0 = =A0=A0=A0 =A0=A0=A0 /* lets you reposition the stream */=0A>> -=A0=A0=A0 = =A0=A0=A0 bool_t=A0 (*x_setpostn)(struct __rpc_xdr *, u_int);=0A>> +=A0=A0= =A0 =A0=A0=A0 bool_t=A0 (*x_setpostn)(struct XDR *, u_int);=0A>>=A0 =A0=A0= =A0 =A0=A0=A0 /* buf quick ptr to buffered data */=0A>> -=A0=A0=A0 =A0=A0= =A0 int32_t *(*x_inline)(struct __rpc_xdr *, u_int);=0A>> +=A0=A0=A0 =A0=A0= =A0 int32_t *(*x_inline)(struct XDR *, u_int);=0A>>=A0 =A0=A0=A0 =A0=A0=A0= /* free privates of this xdr_stream */=0A>> -=A0=A0=A0 =A0=A0=A0 void=A0= =A0=A0 (*x_destroy)(struct __rpc_xdr *);=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t= =A0=A0=A0 (*x_control)(struct __rpc_xdr *, int, void *);=0A>> +=A0=A0=A0 = =A0=A0=A0 void=A0=A0=A0 (*x_destroy)(struct XDR *);=0A>> +=A0=A0=A0 =A0=A0= =A0 bool_t=A0=A0=A0 (*x_control)(struct XDR *, int, void *);=0A>>=A0 =A0= =A0=A0 } *x_ops;=0A>>=A0 =A0=A0=A0 char *=A0=A0=A0 =A0=A0=A0 x_public;=A0= =A0=A0 /* users' data */=0A>>=A0 =A0=A0=A0 void *=A0=A0=A0 =A0=A0=A0 x_pri= vate;=A0=A0=A0 /* pointer to private data */=0A>> @@ -366,4 +370,8 @@ exter= n bool_t xdrrec_eof(XDR *);=0A>>=A0 extern u_int xdrrec_readbytes(XDR *, c= addr_t, u_int);=0A>>=A0 __END_DECLS=0A>>=0A>> +#ifdef __cplusplus=0A>> +}= =0A>> +#endif=0A>> +=0A>>=A0 #endif /* !_RPC_XDR_H */=0A>>=0A>> Modified: = head/sys/rpc/rpc_com.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/sys/rpc/rpc_com.h=A0= =A0=A0 Sun Sep=A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ head/sys/rpc/= rpc_com.h=A0=A0=A0 Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r240060)=0A>> @@ -1= 14,8 +114,8 @@ extern int __rpc_sockisbound(struct sock=0A>>=A0 extern int= bindresvport(struct socket *so, struct sockaddr *sa);=0A>>=0A>>=A0 struct= xucred;=0A>> -struct __rpc_xdr;=0A>> -bool_t xdr_authunix_parms(struct __r= pc_xdr *xdrs, uint32_t *time, struct xucred *cred);=0A>> +struct XDR;=0A>> = +bool_t xdr_authunix_parms(struct XDR *xdrs, uint32_t *time, struct xucred = *cred);=0A>>=A0 #endif=0A>>=0A>>=A0 __END_DECLS=0A>>=0A>> Modified: head/= sys/rpc/xdr.h=0A>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A>> --- head/sys/rpc/xdr.h=A0=A0=A0 Sun Sep= =A0 2 18:54:51 2012=A0=A0=A0 (r240059)=0A>> +++ head/sys/rpc/xdr.h=A0=A0=A0= Sun Sep=A0 2 21:04:40 2012=A0=A0=A0 (r240060)=0A>> @@ -97,26 +97,26 @@ enu= m xdr_op {=0A>>=A0 =A0 * an operations vector for the particular implementa= tion (e.g. see xdr_mem.c),=0A>>=A0 =A0 * and two private fields for the use= of the particular implementation.=0A>>=A0 =A0 */=0A>> -typedef struct __rp= c_xdr {=0A>> +typedef struct XDR {=0A>>=A0 =A0=A0=A0 enum xdr_op=A0=A0=A0 = x_op;=A0=A0=A0 =A0=A0=A0 /* operation; fast additional param */=0A>>=A0 = =A0=A0=A0 const struct xdr_ops {=0A>>=A0 =A0=A0=A0 =A0=A0=A0 /* get a long= from underlying stream */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_ge= tlong)(struct __rpc_xdr *, long *);=0A>> +=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0= =A0 (*x_getlong)(struct XDR *, long *);=0A>>=A0 =A0=A0=A0 =A0=A0=A0 /* put= a long to " */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_putlong)(stru= ct __rpc_xdr *, const long *);=0A>> +=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*= x_putlong)(struct XDR *, const long *);=0A>>=A0 =A0=A0=A0 =A0=A0=A0 /* get= some bytes from " */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 (*x_getbyte= s)(struct __rpc_xdr *, char *, u_int);=0A>> +=A0=A0=A0 =A0=A0=A0 bool_t=A0= =A0=A0 (*x_getbytes)(struct XDR *, char *, u_int);=0A>>=A0 =A0=A0=A0 =A0= =A0=A0 /* put some bytes to " */=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t=A0=A0=A0 = (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);=0A>> +=A0=A0=A0 =A0= =A0=A0 bool_t=A0=A0=A0 (*x_putbytes)(struct XDR *, const char *, u_int);=0A= >>=A0 =A0=A0=A0 =A0=A0=A0 /* returns bytes off from beginning */=0A>> -=A0= =A0=A0 =A0=A0=A0 u_int=A0=A0=A0 (*x_getpostn)(struct __rpc_xdr *);=0A>> += =A0=A0=A0 =A0=A0=A0 u_int=A0=A0=A0 (*x_getpostn)(struct XDR *);=0A>>=A0 = =A0=A0=A0 =A0=A0=A0 /* lets you reposition the stream */=0A>> -=A0=A0=A0 = =A0=A0=A0 bool_t=A0 (*x_setpostn)(struct __rpc_xdr *, u_int);=0A>> +=A0=A0= =A0 =A0=A0=A0 bool_t=A0 (*x_setpostn)(struct XDR *, u_int);=0A>>=A0 =A0=A0= =A0 =A0=A0=A0 /* buf quick ptr to buffered data */=0A>> -=A0=A0=A0 =A0=A0= =A0 int32_t *(*x_inline)(struct __rpc_xdr *, u_int);=0A>> +=A0=A0=A0 =A0=A0= =A0 int32_t *(*x_inline)(struct XDR *, u_int);=0A>>=A0 =A0=A0=A0 =A0=A0=A0= /* free privates of this xdr_stream */=0A>> -=A0=A0=A0 =A0=A0=A0 void=A0= =A0=A0 (*x_destroy)(struct __rpc_xdr *);=0A>> -=A0=A0=A0 =A0=A0=A0 bool_t= =A0=A0=A0 (*x_control)(struct __rpc_xdr *, int, void *);=0A>> +=A0=A0=A0 = =A0=A0=A0 void=A0=A0=A0 (*x_destroy)(struct XDR *);=0A>> +=A0=A0=A0 =A0=A0= =A0 bool_t=A0=A0=A0 (*x_control)(struct XDR *, int, void *);=0A>>=A0 =A0= =A0=A0 } *x_ops;=0A>>=A0 =A0=A0=A0 char *=A0=A0=A0 =A0=A0=A0 x_public;=A0= =A0=A0 /* users' data */=0A>>=A0 =A0=A0=A0 void *=A0=A0=A0 =A0=A0=A0 x_pri= vate;=A0=A0=A0 /* pointer to private data */=0A>=0A>Don't __BEGIN_DECLS and= __END_DECLS do exactly that? i.e. it looks like =0A>some of the #ifdef's y= ou added are redundant.=0A>=0A>=0A>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1346623171.31494.YahooMailNeo>