This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Hi! rpc/ headers use some types which are only defined with __USE_BSD, so including a rpc/ header in -std=c[89]9 or -ansi compilation fails. Below are two approaches, the first is just to use __ prefixed variants of the types in rpc/ headers, the latter is to define those types in rpc/types.h even if __USE_BSD is not defined (sunrpc code especially rpcgen generated will probably use those types as well). Jakub
2001-05-29 Jakub Jelinek <jakub@redhat.com>
* sunrpc/rpc/auth.h: Add __ prefix to __USE_BSD types.
* sunrpc/rpc/auth_unix.h: Likewise.
* sunrpc/rpc/clnt.h: Likewise.
* sunrpc/rpc/key_prot.h: Likewise.
* sunrpc/rpc/pmap_clnt.h: Likewise.
* sunrpc/rpc/pmap_prot.h: Likewise.
* sunrpc/rpc/pmap_rmt.h: Likewise.
* sunrpc/rpc/rpc_des.h: Likewise.
* sunrpc/rpc/rpc_msg.h: Likewise.
* sunrpc/rpc/svc.h: Likewise.
* sunrpc/rpc/types.h: Likewise.
* sunrpc/rpc/xdr.h: Likewise.
--- libc/sunrpc/rpc/auth.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/auth.h Tue May 29 09:56:25 2001
@@ -84,8 +84,8 @@ extern bool_t xdr_des_block (XDR *__xdrs
*/
struct opaque_auth {
enum_t oa_flavor; /* flavor of auth */
- caddr_t oa_base; /* address of more auth stuff */
- u_int oa_length; /* not to exceed MAX_AUTH_BYTES */
+ __caddr_t oa_base; /* address of more auth stuff */
+ __u_int oa_length; /* not to exceed MAX_AUTH_BYTES */
};
/*
@@ -104,7 +104,7 @@ struct AUTH {
int (*ah_refresh) (AUTH *); /* refresh credentials */
void (*ah_destroy) (AUTH *); /* destroy this structure */
} *ah_ops;
- caddr_t ah_private;
+ __caddr_t ah_private;
};
@@ -162,10 +162,10 @@ extern AUTH *authunix_create (char *__ma
int __len, __gid_t *__aup_gids) __THROW;
extern AUTH *authunix_create_default (void) __THROW;
extern AUTH *authnone_create (void) __THROW;
-extern AUTH *authdes_create (const char *__servername, u_int __window,
+extern AUTH *authdes_create (const char *__servername, __u_int __window,
struct sockaddr *__syncaddr, des_block *__ckey)
__THROW;
-extern AUTH *authdes_pk_create (const char *, netobj *, u_int,
+extern AUTH *authdes_pk_create (const char *, netobj *, __u_int,
struct sockaddr *, des_block *) __THROW;
--- libc/sunrpc/rpc/auth_unix.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/auth_unix.h Tue May 29 09:56:25 2001
@@ -64,11 +64,11 @@ __BEGIN_DECLS
*/
struct authunix_parms
{
- u_long aup_time;
+ __u_long aup_time;
char *aup_machname;
__uid_t aup_uid;
__gid_t aup_gid;
- u_int aup_len;
+ __u_int aup_len;
__gid_t *aup_gids;
};
--- libc/sunrpc/rpc/clnt.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/clnt.h Tue May 29 09:56:25 2001
@@ -109,8 +109,8 @@ struct rpc_err {
int RE_errno; /* related system error */
enum auth_stat RE_why; /* why the auth error occurred */
struct {
- u_long low; /* lowest verion supported */
- u_long high; /* highest verion supported */
+ __u_long low; /* lowest verion supported */
+ __u_long high; /* highest verion supported */
} RE_vers;
struct { /* maybe meaningful if RPC_FAILED */
long s1;
@@ -133,19 +133,19 @@ typedef struct CLIENT CLIENT;
struct CLIENT {
AUTH *cl_auth; /* authenticator */
struct clnt_ops {
- enum clnt_stat (*cl_call) (CLIENT *, u_long, xdrproc_t, caddr_t, xdrproc_t,
- caddr_t, struct timeval);
+ enum clnt_stat (*cl_call) (CLIENT *, __u_long, xdrproc_t, __caddr_t, xdrproc_t,
+ __caddr_t, struct timeval);
/* call remote procedure */
void (*cl_abort) (void); /* abort a call */
void (*cl_geterr) (CLIENT *, struct rpc_err *);
/* get specific error code */
- bool_t (*cl_freeres) (CLIENT *, xdrproc_t, caddr_t);
+ bool_t (*cl_freeres) (CLIENT *, xdrproc_t, __caddr_t);
/* frees results */
void (*cl_destroy) (CLIENT *); /* destroy this structure */
bool_t (*cl_control) (CLIENT *, int, char *);
/* the ioctl() of rpc */
} *cl_ops;
- caddr_t cl_private; /* private stuff */
+ __caddr_t cl_private; /* private stuff */
};
@@ -160,11 +160,11 @@ struct CLIENT {
* enum clnt_stat
* CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
* CLIENT *rh;
- * u_long proc;
+ * __u_long proc;
* xdrproc_t xargs;
- * caddr_t argsp;
+ * __caddr_t argsp;
* xdrproc_t xres;
- * caddr_t resp;
+ * __caddr_t resp;
* struct timeval timeout;
*/
#define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
@@ -194,7 +194,7 @@ struct CLIENT {
* CLNT_FREERES(rh, xres, resp);
* CLIENT *rh;
* xdrproc_t xres;
- * caddr_t resp;
+ * __caddr_t resp;
*/
#define CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
#define clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
@@ -203,7 +203,7 @@ struct CLIENT {
* bool_t
* CLNT_CONTROL(cl, request, info)
* CLIENT *cl;
- * u_int request;
+ * __u_int request;
* char *info;
*/
#define CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
@@ -253,16 +253,16 @@ struct CLIENT {
* and network administration.
*/
-#define RPCTEST_PROGRAM ((u_long)1)
-#define RPCTEST_VERSION ((u_long)1)
-#define RPCTEST_NULL_PROC ((u_long)2)
-#define RPCTEST_NULL_BATCH_PROC ((u_long)3)
+#define RPCTEST_PROGRAM ((__u_long)1)
+#define RPCTEST_VERSION ((__u_long)1)
+#define RPCTEST_NULL_PROC ((__u_long)2)
+#define RPCTEST_NULL_BATCH_PROC ((__u_long)3)
/*
* By convention, procedure 0 takes null arguments and returns them
*/
-#define NULLPROC ((u_long)0)
+#define NULLPROC ((__u_long)0)
/*
* Below are the client handle creation routines for the various
@@ -274,10 +274,10 @@ struct CLIENT {
* Memory based rpc (for speed check and testing)
* CLIENT *
* clntraw_create(prog, vers)
- * u_long prog;
- * u_long vers;
+ * __u_long prog;
+ * __u_long vers;
*/
-extern CLIENT *clntraw_create (__const u_long __prog, __const u_long __vers)
+extern CLIENT *clntraw_create (__const __u_long __prog, __const __u_long __vers)
__THROW;
@@ -287,12 +287,12 @@ extern CLIENT *clntraw_create (__const u
* CLIENT *
* clnt_create(host, prog, vers, prot)
* char *host; -- hostname
- * u_long prog; -- program number
+ * __u_long prog; -- program number
* u_ong vers; -- version number
* char *prot; -- protocol
*/
-extern CLIENT *clnt_create (__const char *__host, __const u_long __prog,
- __const u_long __vers, __const char *__prot)
+extern CLIENT *clnt_create (__const char *__host, __const __u_long __prog,
+ __const __u_long __vers, __const char *__prot)
__THROW;
@@ -301,23 +301,23 @@ extern CLIENT *clnt_create (__const char
* CLIENT *
* clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
* struct sockaddr_in *raddr;
- * u_long prog;
- * u_long version;
+ * __u_long prog;
+ * __u_long version;
* register int *sockp;
- * u_int sendsz;
- * u_int recvsz;
+ * __u_int sendsz;
+ * __u_int recvsz;
*/
-extern CLIENT *clnttcp_create (struct sockaddr_in *__raddr, u_long __prog,
- u_long __version, int *__sockp, u_int __sendsz,
- u_int __recvsz) __THROW;
+extern CLIENT *clnttcp_create (struct sockaddr_in *__raddr, __u_long __prog,
+ __u_long __version, int *__sockp, __u_int __sendsz,
+ __u_int __recvsz) __THROW;
/*
* UDP based rpc.
* CLIENT *
* clntudp_create(raddr, program, version, wait, sockp)
* struct sockaddr_in *raddr;
- * u_long program;
- * u_long version;
+ * __u_long program;
+ * __u_long version;
* struct timeval wait_resend;
* int *sockp;
*
@@ -325,20 +325,20 @@ extern CLIENT *clnttcp_create (struct so
* CLIENT *
* clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
* struct sockaddr_in *raddr;
- * u_long program;
- * u_long version;
+ * __u_long program;
+ * __u_long version;
* struct timeval wait_resend;
* int *sockp;
- * u_int sendsz;
- * u_int recvsz;
+ * __u_int sendsz;
+ * __u_int recvsz;
*/
-extern CLIENT *clntudp_create (struct sockaddr_in *__raddr, u_long __program,
- u_long __version, struct timeval __wait_resend,
+extern CLIENT *clntudp_create (struct sockaddr_in *__raddr, __u_long __program,
+ __u_long __version, struct timeval __wait_resend,
int *__sockp) __THROW;
extern CLIENT *clntudp_bufcreate (struct sockaddr_in *__raddr,
- u_long __program, u_long __version,
+ __u_long __program, __u_long __version,
struct timeval __wait_resend, int *__sockp,
- u_int __sendsz, u_int __recvsz) __THROW;
+ __u_int __sendsz, __u_int __recvsz) __THROW;
@@ -348,19 +348,19 @@ extern CLIENT *clntudp_bufcreate (struct
* CLIENT *
* clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
* struct sockaddr_un *raddr;
- * u_long prog;
- * u_long version;
+ * __u_long prog;
+ * __u_long version;
* register int *sockp;
- * u_int sendsz;
- * u_int recvsz;
+ * __u_int sendsz;
+ * __u_int recvsz;
*/
-extern CLIENT *clntunix_create (struct sockaddr_un *__raddr, u_long __program,
- u_long __version, int *__sockp,
- u_int __sendsz, u_int __recvsz) __THROW;
+extern CLIENT *clntunix_create (struct sockaddr_un *__raddr, __u_long __program,
+ __u_long __version, int *__sockp,
+ __u_int __sendsz, __u_int __recvsz) __THROW;
-extern int callrpc (__const char *__host, __const u_long __prognum,
- __const u_long __versnum, __const u_long __procnum,
+extern int callrpc (__const char *__host, __const __u_long __prognum,
+ __const __u_long __versnum, __const __u_long __procnum,
__const xdrproc_t __inproc, __const char *__in,
__const xdrproc_t __outproc, char *__out) __THROW;
extern int _rpc_dtablesize (void) __THROW;
@@ -404,8 +404,8 @@ extern char *clnt_sperrno (enum clnt_sta
/*
* get the port number on the host for the rpc program,version and proto
*/
-extern int getrpcport (__const char * __host, u_long __prognum,
- u_long __versnum, u_int proto) __THROW;
+extern int getrpcport (__const char * __host, __u_long __prognum,
+ __u_long __versnum, __u_int proto) __THROW;
/*
* get the local host's IP address without consulting
--- libc/sunrpc/rpc/key_prot.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/key_prot.h Tue May 29 09:56:25 2001
@@ -136,11 +136,11 @@ bool_t xdr_cryptkeyres();
#define MAXGIDS 16
struct unixcred {
- u_int uid;
- u_int gid;
+ __u_int uid;
+ __u_int gid;
struct {
- u_int gids_len;
- u_int *gids_val;
+ __u_int gids_len;
+ __u_int *gids_val;
} gids;
};
typedef struct unixcred unixcred;
@@ -205,61 +205,61 @@ bool_t xdr_key_netstres();
#endif
-#define KEY_PROG ((u_long)100029)
-#define KEY_VERS ((u_long)1)
+#define KEY_PROG ((__u_long)100029)
+#define KEY_VERS ((__u_long)1)
#ifdef __cplusplus
-#define KEY_SET ((u_long)1)
+#define KEY_SET ((__u_long)1)
extern "C" keystatus * key_set_1(opaque *, CLIENT *);
extern "C" keystatus * key_set_1_svc(opaque *, struct svc_req *);
-#define KEY_ENCRYPT ((u_long)2)
+#define KEY_ENCRYPT ((__u_long)2)
extern "C" cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
extern "C" cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_DECRYPT ((u_long)3)
+#define KEY_DECRYPT ((__u_long)3)
extern "C" cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
extern "C" cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_GEN ((u_long)4)
+#define KEY_GEN ((__u_long)4)
extern "C" des_block * key_gen_1(void *, CLIENT *);
extern "C" des_block * key_gen_1_svc(void *, struct svc_req *);
-#define KEY_GETCRED ((u_long)5)
+#define KEY_GETCRED ((__u_long)5)
extern "C" getcredres * key_getcred_1(netnamestr *, CLIENT *);
extern "C" getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
#elif __STDC__
-#define KEY_SET ((u_long)1)
+#define KEY_SET ((__u_long)1)
extern keystatus * key_set_1(opaque *, CLIENT *);
extern keystatus * key_set_1_svc(opaque *, struct svc_req *);
-#define KEY_ENCRYPT ((u_long)2)
+#define KEY_ENCRYPT ((__u_long)2)
extern cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
extern cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_DECRYPT ((u_long)3)
+#define KEY_DECRYPT ((__u_long)3)
extern cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
extern cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define KEY_GEN ((u_long)4)
+#define KEY_GEN ((__u_long)4)
extern des_block * key_gen_1(void *, CLIENT *);
extern des_block * key_gen_1_svc(void *, struct svc_req *);
-#define KEY_GETCRED ((u_long)5)
+#define KEY_GETCRED ((__u_long)5)
extern getcredres * key_getcred_1(netnamestr *, CLIENT *);
extern getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
#else /* Old Style C */
-#define KEY_SET ((u_long)1)
+#define KEY_SET ((__u_long)1)
extern keystatus * key_set_1();
extern keystatus * key_set_1_svc();
-#define KEY_ENCRYPT ((u_long)2)
+#define KEY_ENCRYPT ((__u_long)2)
extern cryptkeyres * key_encrypt_1();
extern cryptkeyres * key_encrypt_1_svc();
-#define KEY_DECRYPT ((u_long)3)
+#define KEY_DECRYPT ((__u_long)3)
extern cryptkeyres * key_decrypt_1();
extern cryptkeyres * key_decrypt_1_svc();
-#define KEY_GEN ((u_long)4)
+#define KEY_GEN ((__u_long)4)
extern des_block * key_gen_1();
extern des_block * key_gen_1_svc();
-#define KEY_GETCRED ((u_long)5)
+#define KEY_GETCRED ((__u_long)5)
extern getcredres * key_getcred_1();
extern getcredres * key_getcred_1_svc();
#endif /* Old Style C */
-#define KEY_VERS2 ((u_long)2)
+#define KEY_VERS2 ((__u_long)2)
#ifdef __cplusplus
extern "C" keystatus * key_set_2(opaque *, CLIENT *);
@@ -272,19 +272,19 @@ extern "C" des_block * key_gen_2(void *,
extern "C" des_block * key_gen_2_svc(void *, struct svc_req *);
extern "C" getcredres * key_getcred_2(netnamestr *, CLIENT *);
extern "C" getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define KEY_ENCRYPT_PK ((u_long)6)
+#define KEY_ENCRYPT_PK ((__u_long)6)
extern "C" cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
extern "C" cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_DECRYPT_PK ((u_long)7)
+#define KEY_DECRYPT_PK ((__u_long)7)
extern "C" cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
extern "C" cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_NET_PUT ((u_long)8)
+#define KEY_NET_PUT ((__u_long)8)
extern "C" keystatus * key_net_put_2(key_netstarg *, CLIENT *);
extern "C" keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define KEY_NET_GET ((u_long)9)
+#define KEY_NET_GET ((__u_long)9)
extern "C" key_netstres * key_net_get_2(void *, CLIENT *);
extern "C" key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define KEY_GET_CONV ((u_long)10)
+#define KEY_GET_CONV ((__u_long)10)
extern "C" cryptkeyres * key_get_conv_2(opaque *, CLIENT *);
extern "C" cryptkeyres * key_get_conv_2_svc(opaque *, struct svc_req *);
@@ -299,19 +299,19 @@ extern des_block * key_gen_2(void *, CL
extern des_block * key_gen_2_svc(void *, struct svc_req *);
extern getcredres * key_getcred_2(netnamestr *, CLIENT *);
extern getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define KEY_ENCRYPT_PK ((u_long)6)
+#define KEY_ENCRYPT_PK ((__u_long)6)
extern cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
extern cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_DECRYPT_PK ((u_long)7)
+#define KEY_DECRYPT_PK ((__u_long)7)
extern cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
extern cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define KEY_NET_PUT ((u_long)8)
+#define KEY_NET_PUT ((__u_long)8)
extern keystatus * key_net_put_2(key_netstarg *, CLIENT *);
extern keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define KEY_NET_GET ((u_long)9)
+#define KEY_NET_GET ((__u_long)9)
extern key_netstres * key_net_get_2(void *, CLIENT *);
extern key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define KEY_GET_CONV ((u_long)10)
+#define KEY_GET_CONV ((__u_long)10)
extern cryptkeyres * key_get_conv_2(opaque *, CLIENT *);
extern cryptkeyres * key_get_conv_2_svc(opaque *, struct svc_req *);
@@ -326,19 +326,19 @@ extern des_block * key_gen_2();
extern des_block * key_gen_2_svc();
extern getcredres * key_getcred_2();
extern getcredres * key_getcred_2_svc();
-#define KEY_ENCRYPT_PK ((u_long)6)
+#define KEY_ENCRYPT_PK ((__u_long)6)
extern cryptkeyres * key_encrypt_pk_2();
extern cryptkeyres * key_encrypt_pk_2_svc();
-#define KEY_DECRYPT_PK ((u_long)7)
+#define KEY_DECRYPT_PK ((__u_long)7)
extern cryptkeyres * key_decrypt_pk_2();
extern cryptkeyres * key_decrypt_pk_2_svc();
-#define KEY_NET_PUT ((u_long)8)
+#define KEY_NET_PUT ((__u_long)8)
extern keystatus * key_net_put_2();
extern keystatus * key_net_put_2_svc();
-#define KEY_NET_GET ((u_long)9)
+#define KEY_NET_GET ((__u_long)9)
extern key_netstres * key_net_get_2();
extern key_netstres * key_net_get_2_svc();
-#define KEY_GET_CONV ((u_long)10)
+#define KEY_GET_CONV ((__u_long)10)
extern cryptkeyres * key_get_conv_2();
extern cryptkeyres * key_get_conv_2_svc();
#endif /* Old Style C */
--- libc/sunrpc/rpc/pmap_clnt.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/pmap_clnt.h Tue May 29 09:56:25 2001
@@ -45,7 +45,7 @@
__BEGIN_DECLS
-typedef bool_t (*resultproc_t) (caddr_t resp, struct sockaddr_in *raddr);
+typedef bool_t (*resultproc_t) (__caddr_t resp, struct sockaddr_in *raddr);
/*
* Usage:
@@ -63,34 +63,34 @@ typedef bool_t (*resultproc_t) (caddr_t
* the procedure eachresult is called. Its form is:
* done = eachresult(resp, raddr)
* bool_t done;
- * caddr_t resp;
+ * __caddr_t resp;
* struct sockaddr_in raddr;
* where resp points to the results of the call and raddr is the
* address if the responder to the broadcast.
*/
-extern bool_t pmap_set (__const u_long __program, __const u_long __vers,
- int __protocol, u_short __port) __THROW;
-extern bool_t pmap_unset (__const u_long __program, __const u_long __vers)
+extern bool_t pmap_set (__const __u_long __program, __const __u_long __vers,
+ int __protocol, __u_short __port) __THROW;
+extern bool_t pmap_unset (__const __u_long __program, __const __u_long __vers)
__THROW;
extern struct pmaplist *pmap_getmaps (struct sockaddr_in *__address) __THROW;
extern enum clnt_stat pmap_rmtcall (struct sockaddr_in *__addr,
- __const u_long __prog,
- __const u_long __vers,
- __const u_long __proc,
+ __const __u_long __prog,
+ __const __u_long __vers,
+ __const __u_long __proc,
xdrproc_t __xdrargs,
- caddr_t __argsp, xdrproc_t __xdrres,
- caddr_t __resp, struct timeval __tout,
- u_long *__port_ptr) __THROW;
-extern enum clnt_stat clnt_broadcast (__const u_long __prog,
- __const u_long __vers,
- __const u_long __proc, xdrproc_t __xargs,
- caddr_t __argsp, xdrproc_t __xresults,
- caddr_t __resultsp,
+ __caddr_t __argsp, xdrproc_t __xdrres,
+ __caddr_t __resp, struct timeval __tout,
+ __u_long *__port_ptr) __THROW;
+extern enum clnt_stat clnt_broadcast (__const __u_long __prog,
+ __const __u_long __vers,
+ __const __u_long __proc, xdrproc_t __xargs,
+ __caddr_t __argsp, xdrproc_t __xresults,
+ __caddr_t __resultsp,
resultproc_t __eachresult) __THROW;
-extern u_short pmap_getport (struct sockaddr_in *__address,
- __const u_long __program,
- __const u_long __version, u_int __protocol)
+extern __u_short pmap_getport (struct sockaddr_in *__address,
+ __const __u_long __program,
+ __const __u_long __version, __u_int __protocol)
__THROW;
__END_DECLS
--- libc/sunrpc/rpc/pmap_prot.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/pmap_prot.h Tue May 29 09:56:25 2001
@@ -75,17 +75,17 @@ __BEGIN_DECLS
* The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
*/
-#define PMAPPORT ((u_short)111)
-#define PMAPPROG ((u_long)100000)
-#define PMAPVERS ((u_long)2)
-#define PMAPVERS_PROTO ((u_long)2)
-#define PMAPVERS_ORIG ((u_long)1)
-#define PMAPPROC_NULL ((u_long)0)
-#define PMAPPROC_SET ((u_long)1)
-#define PMAPPROC_UNSET ((u_long)2)
-#define PMAPPROC_GETPORT ((u_long)3)
-#define PMAPPROC_DUMP ((u_long)4)
-#define PMAPPROC_CALLIT ((u_long)5)
+#define PMAPPORT ((__u_short)111)
+#define PMAPPROG ((__u_long)100000)
+#define PMAPVERS ((__u_long)2)
+#define PMAPVERS_PROTO ((__u_long)2)
+#define PMAPVERS_ORIG ((__u_long)1)
+#define PMAPPROC_NULL ((__u_long)0)
+#define PMAPPROC_SET ((__u_long)1)
+#define PMAPPROC_UNSET ((__u_long)2)
+#define PMAPPROC_GETPORT ((__u_long)3)
+#define PMAPPROC_DUMP ((__u_long)4)
+#define PMAPPROC_CALLIT ((__u_long)5)
struct pmap {
long unsigned pm_prog;
--- libc/sunrpc/rpc/pmap_rmt.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/pmap_rmt.h Tue May 29 09:56:25 2001
@@ -46,8 +46,8 @@
__BEGIN_DECLS
struct rmtcallargs {
- u_long prog, vers, proc, arglen;
- caddr_t args_ptr;
+ __u_long prog, vers, proc, arglen;
+ __caddr_t args_ptr;
xdrproc_t xdr_args;
};
@@ -55,9 +55,9 @@ extern bool_t xdr_rmtcall_args (XDR *__x
__THROW;
struct rmtcallres {
- u_long *port_ptr;
- u_long resultslen;
- caddr_t results_ptr;
+ __u_long *port_ptr;
+ __u_long resultslen;
+ __caddr_t results_ptr;
xdrproc_t xdr_results;
};
--- libc/sunrpc/rpc/rpc_msg.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/rpc_msg.h Tue May 29 09:56:25 2001
@@ -44,8 +44,8 @@
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
-#define RPC_MSG_VERSION ((u_long) 2)
-#define RPC_SERVICE_PORT ((u_short) 2048)
+#define RPC_MSG_VERSION ((__u_long) 2)
+#define RPC_SERVICE_PORT ((__u_short) 2048)
__BEGIN_DECLS
@@ -93,11 +93,11 @@ struct accepted_reply {
enum accept_stat ar_stat;
union {
struct {
- u_long low;
- u_long high;
+ __u_long low;
+ __u_long high;
} AR_versions;
struct {
- caddr_t where;
+ __caddr_t where;
xdrproc_t proc;
} AR_results;
/* and many other null cases */
@@ -113,8 +113,8 @@ struct rejected_reply {
enum reject_stat rj_stat;
union {
struct {
- u_long low;
- u_long high;
+ __u_long low;
+ __u_long high;
} RJ_versions;
enum auth_stat RJ_why; /* why authentication did not work */
} ru;
@@ -139,10 +139,10 @@ struct reply_body {
* Body of an rpc request call.
*/
struct call_body {
- u_long cb_rpcvers; /* must be equal to two */
- u_long cb_prog;
- u_long cb_vers;
- u_long cb_proc;
+ __u_long cb_rpcvers; /* must be equal to two */
+ __u_long cb_prog;
+ __u_long cb_vers;
+ __u_long cb_proc;
struct opaque_auth cb_cred;
struct opaque_auth cb_verf; /* protocol specific - provided by client */
};
@@ -151,7 +151,7 @@ struct call_body {
* The rpc message
*/
struct rpc_msg {
- u_long rm_xid;
+ __u_long rm_xid;
enum msg_type rm_direction;
union {
struct call_body RM_cmb;
--- libc/sunrpc/rpc/svc.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/svc.h Tue May 29 09:56:25 2001
@@ -75,18 +75,18 @@ enum xprt_stat {
typedef struct SVCXPRT SVCXPRT;
struct SVCXPRT {
int xp_sock;
- u_short xp_port; /* associated port number */
+ __u_short xp_port; /* associated port number */
const struct xp_ops {
bool_t (*xp_recv) (SVCXPRT *__xprt, struct rpc_msg *__msg);
/* receive incoming requests */
enum xprt_stat (*xp_stat) (SVCXPRT *__xprt);
/* get transport status */
bool_t (*xp_getargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
- caddr_t args_ptr); /* get arguments */
+ __caddr_t args_ptr); /* get arguments */
bool_t (*xp_reply) (SVCXPRT *__xprt, struct rpc_msg *__msg);
/* send reply */
bool_t (*xp_freeargs) (SVCXPRT *__xprt, xdrproc_t __xdr_args,
- caddr_t args_ptr);
+ __caddr_t args_ptr);
/* free mem allocated for args */
void (*xp_destroy) (SVCXPRT *__xprt);
/* destroy this struct */
@@ -94,8 +94,8 @@ struct SVCXPRT {
int xp_addrlen; /* length of remote address */
struct sockaddr_in xp_raddr; /* remote address */
struct opaque_auth xp_verf; /* raw response verifier */
- caddr_t xp_p1; /* private */
- caddr_t xp_p2; /* private */
+ __caddr_t xp_p1; /* private */
+ __caddr_t xp_p2; /* private */
char xp_pad [256]; /* padding, internal use */
};
@@ -110,7 +110,7 @@ struct SVCXPRT {
* SVCXPRT *xprt;
* struct rpc_msg *msg;
* xdrproc_t xargs;
- * caddr_t argsp;
+ * __caddr_t argsp;
*/
#define SVC_RECV(xprt, msg) \
(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
@@ -151,7 +151,7 @@ struct svc_req {
rpcvers_t rq_vers; /* service protocol version */
rpcproc_t rq_proc; /* the desired procedure */
struct opaque_auth rq_cred; /* raw creds from the wire */
- caddr_t rq_clntcred; /* read only cooked cred */
+ __caddr_t rq_clntcred; /* read only cooked cred */
SVCXPRT *rq_xprt; /* associated transport */
};
@@ -227,7 +227,7 @@ extern void xprt_unregister (SVCXPRT *__
*/
extern bool_t svc_sendreply (SVCXPRT *xprt, xdrproc_t __xdr_results,
- caddr_t __xdr_location) __THROW;
+ __caddr_t __xdr_location) __THROW;
extern void svcerr_decode (SVCXPRT *__xprt) __THROW;
@@ -294,20 +294,20 @@ extern SVCXPRT *svcraw_create (void) __T
* Udp based rpc.
*/
extern SVCXPRT *svcudp_create (int __sock) __THROW;
-extern SVCXPRT *svcudp_bufcreate (int __sock, u_int __sendsz, u_int __recvsz)
+extern SVCXPRT *svcudp_bufcreate (int __sock, __u_int __sendsz, __u_int __recvsz)
__THROW;
/*
* Tcp based rpc.
*/
-extern SVCXPRT *svctcp_create (int __sock, u_int __sendsize, u_int __recvsize)
+extern SVCXPRT *svctcp_create (int __sock, __u_int __sendsize, __u_int __recvsize)
__THROW;
/*
* Unix based rpc.
*/
-extern SVCXPRT *svcunix_create (int __sock, u_int __sendsize, u_int __recvsize,
+extern SVCXPRT *svcunix_create (int __sock, __u_int __sendsize, __u_int __recvsize,
char *__path) __THROW;
--- libc/sunrpc/rpc/types.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/types.h Tue May 29 09:56:25 2001
@@ -69,7 +69,7 @@ typedef unsigned long rpcport_t;
#include <netinet/in.h>
#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK (u_long)0x7F000001
+#define INADDR_LOOPBACK (__u_long)0x7F000001
#endif
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 64
--- libc/sunrpc/rpc/xdr.h.jj Mon Mar 26 10:02:37 2001
+++ libc/sunrpc/rpc/xdr.h Tue May 29 10:04:21 2001
@@ -118,13 +118,13 @@ struct XDR
/* get a long from underlying stream */
bool_t (*x_putlong) (XDR *__xdrs, __const long *__lp);
/* put a long to " */
- bool_t (*x_getbytes) (XDR *__xdrs, caddr_t __addr, u_int __len);
+ bool_t (*x_getbytes) (XDR *__xdrs, __caddr_t __addr, __u_int __len);
/* get some bytes from " */
- bool_t (*x_putbytes) (XDR *__xdrs, __const char *__addr, u_int __len);
+ bool_t (*x_putbytes) (XDR *__xdrs, __const char *__addr, __u_int __len);
/* put some bytes to " */
- u_int (*x_getpostn) (__const XDR *__xdrs);
+ __u_int (*x_getpostn) (__const XDR *__xdrs);
/* returns bytes off from beginning */
- bool_t (*x_setpostn) (XDR *__xdrs, u_int __pos);
+ bool_t (*x_setpostn) (XDR *__xdrs, __u_int __pos);
/* lets you reposition the stream */
int32_t *(*x_inline) (XDR *__xdrs, int __len);
/* buf quick ptr to buffered data */
@@ -136,9 +136,9 @@ struct XDR
/* put a int to " */
}
*x_ops;
- caddr_t x_public; /* users' data */
- caddr_t x_private; /* pointer to private data */
- caddr_t x_base; /* private used for position info */
+ __caddr_t x_public; /* users' data */
+ __caddr_t x_private; /* pointer to private data */
+ __caddr_t x_base; /* private used for position info */
int x_handy; /* extra private word */
};
@@ -149,7 +149,7 @@ struct XDR
* The opaque pointer generally points to a structure of the data type
* to be decoded. If this pointer is 0, then the type routines should
* allocate dynamic storage of the appropriate size and return it.
- * bool_t (*xdrproc_t)(XDR *, caddr_t *);
+ * bool_t (*xdrproc_t)(XDR *, __caddr_t *);
*/
typedef bool_t (*xdrproc_t) (XDR *, void *,...);
@@ -160,9 +160,9 @@ typedef bool_t (*xdrproc_t) (XDR *, void
* XDR *xdrs;
* int32_t *int32p;
* long *longp;
- * caddr_t addr;
- * u_int len;
- * u_int pos;
+ * __caddr_t addr;
+ * __u_int len;
+ * __u_int pos;
*/
#define XDR_GETINT32(xdrs, int32p) \
(*(xdrs)->x_ops->x_getint32)(xdrs, int32p)
@@ -263,17 +263,17 @@ struct xdr_discrim
* in the RPC code will not work on 64bit Solaris platforms !
*/
#define IXDR_GET_LONG(buf) \
- ((long)ntohl((u_long)*__extension__((u_int32_t*)(buf))++))
+ ((long)ntohl((__u_long)*__extension__((u_int32_t*)(buf))++))
#define IXDR_PUT_LONG(buf, v) \
- (*__extension__((u_int32_t*)(buf))++ = (long)htonl((u_long)(v)))
-#define IXDR_GET_U_LONG(buf) ((u_long)IXDR_GET_LONG(buf))
+ (*__extension__((u_int32_t*)(buf))++ = (long)htonl((__u_long)(v)))
+#define IXDR_GET_U_LONG(buf) ((__u_long)IXDR_GET_LONG(buf))
#define IXDR_PUT_U_LONG(buf, v) IXDR_PUT_LONG(buf, (long)(v))
#define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_LONG(buf))
#define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_LONG(buf))
#define IXDR_GET_SHORT(buf) ((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf) ((u_short)IXDR_GET_LONG(buf))
+#define IXDR_GET_U_SHORT(buf) ((__u_short)IXDR_GET_LONG(buf))
#define IXDR_PUT_BOOL(buf, v) IXDR_PUT_LONG(buf, (long)(v))
#define IXDR_PUT_ENUM(buf, v) IXDR_PUT_LONG(buf, (long)(v))
@@ -288,15 +288,15 @@ struct xdr_discrim
*/
extern bool_t xdr_void (void) __THROW;
extern bool_t xdr_short (XDR *__xdrs, short *__sp) __THROW;
-extern bool_t xdr_u_short (XDR *__xdrs, u_short *__usp) __THROW;
+extern bool_t xdr_u_short (XDR *__xdrs, __u_short *__usp) __THROW;
extern bool_t xdr_int (XDR *__xdrs, int *__ip) __THROW;
-extern bool_t xdr_u_int (XDR *__xdrs, u_int *__up) __THROW;
+extern bool_t xdr_u_int (XDR *__xdrs, __u_int *__up) __THROW;
extern bool_t xdr_long (XDR *__xdrs, long *__lp) __THROW;
-extern bool_t xdr_u_long (XDR *__xdrs, u_long *__ulp) __THROW;
-extern bool_t xdr_hyper (XDR *__xdrs, quad_t *__llp) __THROW;
-extern bool_t xdr_u_hyper (XDR *__xdrs, u_quad_t *__ullp) __THROW;
-extern bool_t xdr_longlong_t (XDR *__xdrs, quad_t *__llp) __THROW;
-extern bool_t xdr_u_longlong_t (XDR *__xdrs, u_quad_t *__ullp) __THROW;
+extern bool_t xdr_u_long (XDR *__xdrs, __u_long *__ulp) __THROW;
+extern bool_t xdr_hyper (XDR *__xdrs, __quad_t *__llp) __THROW;
+extern bool_t xdr_u_hyper (XDR *__xdrs, __u_quad_t *__ullp) __THROW;
+extern bool_t xdr_longlong_t (XDR *__xdrs, __quad_t *__llp) __THROW;
+extern bool_t xdr_u_longlong_t (XDR *__xdrs, __u_quad_t *__ullp) __THROW;
extern bool_t xdr_int8_t (XDR *__xdrs, int8_t *__ip) __THROW;
extern bool_t xdr_uint8_t (XDR *__xdrs, uint8_t *__up) __THROW;
extern bool_t xdr_int16_t (XDR *__xdrs, int16_t *__ip) __THROW;
@@ -307,28 +307,28 @@ extern bool_t xdr_int64_t (XDR *__xdrs,
extern bool_t xdr_uint64_t (XDR *__xdrs, uint64_t *__up) __THROW;
extern bool_t xdr_bool (XDR *__xdrs, bool_t *__bp) __THROW;
extern bool_t xdr_enum (XDR *__xdrs, enum_t *__ep) __THROW;
-extern bool_t xdr_array (XDR * _xdrs, caddr_t *__addrp, u_int *__sizep,
- u_int __maxsize, u_int __elsize, xdrproc_t __elproc)
+extern bool_t xdr_array (XDR * _xdrs, __caddr_t *__addrp, __u_int *__sizep,
+ __u_int __maxsize, __u_int __elsize, xdrproc_t __elproc)
__THROW;
-extern bool_t xdr_bytes (XDR *__xdrs, char **__cpp, u_int *__sizep,
- u_int __maxsize) __THROW;
-extern bool_t xdr_opaque (XDR *__xdrs, caddr_t __cp, u_int __cnt) __THROW;
-extern bool_t xdr_string (XDR *__xdrs, char **__cpp, u_int __maxsize) __THROW;
+extern bool_t xdr_bytes (XDR *__xdrs, char **__cpp, __u_int *__sizep,
+ __u_int __maxsize) __THROW;
+extern bool_t xdr_opaque (XDR *__xdrs, __caddr_t __cp, __u_int __cnt) __THROW;
+extern bool_t xdr_string (XDR *__xdrs, char **__cpp, __u_int __maxsize) __THROW;
extern bool_t xdr_union (XDR *__xdrs, enum_t *__dscmp, char *__unp,
__const struct xdr_discrim *__choices,
xdrproc_t dfault) __THROW;
extern bool_t xdr_char (XDR *__xdrs, char *__cp) __THROW;
-extern bool_t xdr_u_char (XDR *__xdrs, u_char *__cp) __THROW;
-extern bool_t xdr_vector (XDR *__xdrs, char *__basep, u_int __nelem,
- u_int __elemsize, xdrproc_t __xdr_elem) __THROW;
+extern bool_t xdr_u_char (XDR *__xdrs, __u_char *__cp) __THROW;
+extern bool_t xdr_vector (XDR *__xdrs, char *__basep, __u_int __nelem,
+ __u_int __elemsize, xdrproc_t __xdr_elem) __THROW;
extern bool_t xdr_float (XDR *__xdrs, float *__fp) __THROW;
extern bool_t xdr_double (XDR *__xdrs, double *__dp) __THROW;
-extern bool_t xdr_reference (XDR *__xdrs, caddr_t *__xpp, u_int __size,
+extern bool_t xdr_reference (XDR *__xdrs, __caddr_t *__xpp, __u_int __size,
xdrproc_t __proc) __THROW;
extern bool_t xdr_pointer (XDR *__xdrs, char **__objpp,
- u_int __obj_size, xdrproc_t __xdr_obj) __THROW;
+ __u_int __obj_size, xdrproc_t __xdr_obj) __THROW;
extern bool_t xdr_wrapstring (XDR *__xdrs, char **__cpp) __THROW;
-extern u_long xdr_sizeof (xdrproc_t, void *) __THROW;
+extern __u_long xdr_sizeof (xdrproc_t, void *) __THROW;
/*
* Common opaque bytes objects used by many rpc protocols;
@@ -337,7 +337,7 @@ extern u_long xdr_sizeof (xdrproc_t, voi
#define MAX_NETOBJ_SZ 1024
struct netobj
{
- u_int n_len;
+ __u_int n_len;
char *n_bytes;
};
typedef struct netobj netobj;
@@ -349,16 +349,16 @@ extern bool_t xdr_netobj (XDR *__xdrs, s
*/
/* XDR using memory buffers */
-extern void xdrmem_create (XDR *__xdrs, __const caddr_t __addr,
- u_int __size, enum xdr_op __xop) __THROW;
+extern void xdrmem_create (XDR *__xdrs, __const __caddr_t __addr,
+ __u_int __size, enum xdr_op __xop) __THROW;
/* XDR using stdio library */
extern void xdrstdio_create (XDR *__xdrs, FILE *__file, enum xdr_op __xop)
__THROW;
/* XDR pseudo records for tcp */
-extern void xdrrec_create (XDR *__xdrs, u_int __sendsize,
- u_int __recvsize, caddr_t __tcp_handle,
+extern void xdrrec_create (XDR *__xdrs, __u_int __sendsize,
+ __u_int __recvsize, __caddr_t __tcp_handle,
int (*__readit) (char *, char *, int),
int (*__writeit) (char *, char *, int)) __THROW;
--- libc/sunrpc/rpc/rpc_des.h.jj Tue May 29 09:57:20 2001
+++ libc/sunrpc/rpc/rpc_des.h Tue May 29 10:01:57 2001
@@ -54,15 +54,15 @@ enum desmode
*/
struct desparams
{
- u_char des_key[8]; /* key (with low bit parity) */
+ __u_char des_key[8]; /* key (with low bit parity) */
enum desdir des_dir; /* direction */
enum desmode des_mode; /* mode */
- u_char des_ivec[8]; /* input vector */
+ __u_char des_ivec[8]; /* input vector */
unsigned des_len; /* number of bytes to crypt */
union
{
- u_char UDES_data[DES_QUICKLEN];
- u_char *UDES_buf;
+ __u_char UDES_data[DES_QUICKLEN];
+ __u_char *UDES_buf;
}
UDES;
#define des_data UDES.UDES_data /* direct data here if quick */
2001-05-29 Jakub Jelinek <jakub@redhat.com> * sunrpc/rpc/types.h (u_char, u_short, u_int, u_long, quad_t, u_quad_t, fsid_t, daddr_t, caddr_t): Make sure the types are defined. * posix/sys/types.h (u_char, u_short, u_int, u_long, quad_t, u_quad_t, fsid_t, daddr_t, caddr_t): Protect the __USE_BSD typedefs against multiple definition. --- libc/sunrpc/rpc/types.h.jj Mon Mar 26 10:02:37 2001 +++ libc/sunrpc/rpc/types.h Tue May 29 10:09:51 2001 @@ -63,6 +63,23 @@ typedef unsigned long rpcport_t; #ifndef makedev /* ie, we haven't already included it */ #include <sys/types.h> #endif + +#ifndef __u_char_defined +typedef __u_char u_char; +typedef __u_short u_short; +typedef __u_int u_int; +typedef __u_long u_long; +typedef __quad_t quad_t; +typedef __u_quad_t u_quad_t; +typedef __fsid_t fsid_t; +# define __u_char_defined +#endif +#ifndef __daddr_t_defined +typedef __daddr_t daddr_t; +typedef __caddr_t caddr_t; +# define __daddr_t_defined +#endif + #include <sys/time.h> #include <sys/param.h> --- libc/posix/sys/types.h.jj Mon Aug 14 08:47:38 2000 +++ libc/posix/sys/types.h Tue May 29 10:09:33 2001 @@ -30,6 +30,7 @@ __BEGIN_DECLS #include <bits/types.h> #ifdef __USE_BSD +# ifndef __u_char_defined typedef __u_char u_char; typedef __u_short u_short; typedef __u_int u_int; @@ -37,6 +38,8 @@ typedef __u_long u_long; typedef __quad_t quad_t; typedef __u_quad_t u_quad_t; typedef __fsid_t fsid_t; +# define __u_char_defined +# endif #endif typedef __loff_t loff_t; @@ -108,8 +111,11 @@ typedef __ssize_t ssize_t; #endif #ifdef __USE_BSD +# ifndef __daddr_t_defined typedef __daddr_t daddr_t; typedef __caddr_t caddr_t; +# define __daddr_t_defined +# endif #endif #if (defined __USE_SVID || defined __USE_XOPEN) && !defined __key_t_defined
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |