From d16b2d3548c6308cc4fdcc034c42216f5a936bce Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 27 Nov 2003 09:35:40 +0000 Subject: 2003-11-27 Ralf Corsepius * include/rpc/rpc.hinclude/rpc/rpc.h: Rename struct rtems_rpc_task_variables into struct _rtems_rpc_task_variables (Avoid symbol conflict between struct and variable). struct _rtems_rpc_task_variables *rtems_rpc_task_variables; Reflect changes above. * src/rpc/clnt_perror.c, src/rpc/clnt_raw.c, src/rpc/clnt_simple.c, src/rpc/rpcdname.c, src/rpc/rtems_rpc.c, src/rpc/svc.c, src/rpc/svc_auth.c, src/rpc/svc_raw.c, src/rpc/svc_simple.c: Reflect changes above. --- cpukit/librpc/src/rpc/clnt_perror.c | 2 +- cpukit/librpc/src/rpc/clnt_raw.c | 2 +- cpukit/librpc/src/rpc/clnt_simple.c | 2 +- cpukit/librpc/src/rpc/rpcdname.c | 2 +- cpukit/librpc/src/rpc/rtems_rpc.c | 8 ++++---- cpukit/librpc/src/rpc/svc.c | 6 +++--- cpukit/librpc/src/rpc/svc_auth.c | 2 +- cpukit/librpc/src/rpc/svc_raw.c | 2 +- cpukit/librpc/src/rpc/svc_simple.c | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'cpukit/librpc/src') diff --git a/cpukit/librpc/src/rpc/clnt_perror.c b/cpukit/librpc/src/rpc/clnt_perror.c index 720583ba54..a7df29c0dd 100644 --- a/cpukit/librpc/src/rpc/clnt_perror.c +++ b/cpukit/librpc/src/rpc/clnt_perror.c @@ -50,7 +50,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.11 1999/08/28 static char *auth_errmsg(); #define CLNT_PERROR_BUFLEN 256 -#define buf ((char *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->clnt_perror_buf) +#define buf ((char *)(rtems_rpc_task_variables)->clnt_perror_buf) static char * _buf() diff --git a/cpukit/librpc/src/rpc/clnt_raw.c b/cpukit/librpc/src/rpc/clnt_raw.c index a343c49068..d17221a997 100644 --- a/cpukit/librpc/src/rpc/clnt_raw.c +++ b/cpukit/librpc/src/rpc/clnt_raw.c @@ -60,7 +60,7 @@ struct clnt_raw_private { char mashl_callmsg[MCALL_MSG_SIZE]; u_int mcnt; }; -#define clntraw_private ((struct clnt_raw_private *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->clnt_raw_private) +#define clntraw_private ((struct clnt_raw_private *) (rtems_rpc_task_variables)->clnt_raw_private) static enum clnt_stat clntraw_call(); static void clntraw_abort(); diff --git a/cpukit/librpc/src/rpc/clnt_simple.c b/cpukit/librpc/src/rpc/clnt_simple.c index cab68fda29..b6b90c51c5 100644 --- a/cpukit/librpc/src/rpc/clnt_simple.c +++ b/cpukit/librpc/src/rpc/clnt_simple.c @@ -55,7 +55,7 @@ struct call_rpc_private { int oldprognum, oldversnum, valid; char *oldhost; }; -#define callrpc_private ((struct call_rpc_private *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->call_rpc_private) +#define callrpc_private ((struct call_rpc_private *)(rtems_rpc_task_variables)->call_rpc_private) int callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out) diff --git a/cpukit/librpc/src/rpc/rpcdname.c b/cpukit/librpc/src/rpc/rpcdname.c index fe9cfeecd1..f31ded00c7 100644 --- a/cpukit/librpc/src/rpc/rpcdname.c +++ b/cpukit/librpc/src/rpc/rpcdname.c @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro"; int getdomainname(char *, size_t); -#define default_domain ((char *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->rpcdname_default_domain) +#define default_domain ((char *)(rtems_rpc_task_variables)->rpcdname_default_domain) static char * get_default_domain() diff --git a/cpukit/librpc/src/rpc/rtems_rpc.c b/cpukit/librpc/src/rpc/rtems_rpc.c index d2666e2f91..254558fb47 100644 --- a/cpukit/librpc/src/rpc/rtems_rpc.c +++ b/cpukit/librpc/src/rpc/rtems_rpc.c @@ -9,21 +9,21 @@ /* * RPC variables for single-thread */ -static struct rtems_rpc_task_variables rpc_default = { +static struct _rtems_rpc_task_variables rpc_default = { -1, /* svc_maxfd */ }; /* * RPC values for initializing a new per-task set of variables */ -static const struct rtems_rpc_task_variables rpc_init = { +static const struct _rtems_rpc_task_variables rpc_init = { -1, /* svc_maxfd */ }; /* * Per-task pointer to RPC data */ -void *rtems_rpc_task_variables = &rpc_default; +struct _rtems_rpc_task_variables *rtems_rpc_task_variables = &rpc_default; /* * Set up per-task RPC variables @@ -31,7 +31,7 @@ void *rtems_rpc_task_variables = &rpc_default; int rtems_rpc_task_init (void) { rtems_status_code sc; - struct rtems_rpc_task_variables *tvp; + struct _rtems_rpc_task_variables *tvp; if (rtems_rpc_task_variables == &rpc_default) { tvp = malloc (sizeof *tvp); diff --git a/cpukit/librpc/src/rpc/svc.c b/cpukit/librpc/src/rpc/svc.c index 92832a589b..751ca3185f 100644 --- a/cpukit/librpc/src/rpc/svc.c +++ b/cpukit/librpc/src/rpc/svc.c @@ -49,8 +49,8 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc.c,v 1.14 1999/08/28 00:00:4 #include #include -#define xports ((SVCXPRT **)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_xports) -#define xportssize (((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_xportssize) +#define xports ((SVCXPRT **) rtems_rpc_task_variables->svc_xports) +#define xportssize (rtems_rpc_task_variables->svc_xportssize) #define NULL_SVC ((struct svc_callout *)0) #define RQCRED_SIZE 400 /* this size is excessive */ @@ -69,7 +69,7 @@ struct svc_callout { u_long sc_vers; void (*sc_dispatch)(); }; -#define svc_head (struct svc_callout *)(((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_svc_head) +#define svc_head (struct svc_callout *)((rtems_rpc_task_variables)->svc_svc_head) static struct svc_callout *svc_find(); diff --git a/cpukit/librpc/src/rpc/svc_auth.c b/cpukit/librpc/src/rpc/svc_auth.c index b58596a397..5f36433388 100644 --- a/cpukit/librpc/src/rpc/svc_auth.c +++ b/cpukit/librpc/src/rpc/svc_auth.c @@ -87,7 +87,7 @@ struct authsvc { enum auth_stat (*handler)(); struct authsvc *next; }; -#define Auths ((struct authsvc *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_auths_Auths) +#define Auths ((struct authsvc *)(rtems_rpc_task_variables)->svc_auths_Auths) /* * The call rpc message, msg has been obtained from the wire. The msg contains diff --git a/cpukit/librpc/src/rpc/svc_raw.c b/cpukit/librpc/src/rpc/svc_raw.c index 686c61bdd4..108b18a309 100644 --- a/cpukit/librpc/src/rpc/svc_raw.c +++ b/cpukit/librpc/src/rpc/svc_raw.c @@ -54,7 +54,7 @@ struct svc_raw_private { XDR xdr_stream; char verf_body[MAX_AUTH_BYTES]; }; -#define svcraw_private ((struct svc_raw_private *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_raw_private) +#define svcraw_private ((struct svc_raw_private *)(rtems_rpc_task_variables)->svc_raw_private) static bool_t svcraw_recv(); static enum xprt_stat svcraw_stat(); diff --git a/cpukit/librpc/src/rpc/svc_simple.c b/cpukit/librpc/src/rpc/svc_simple.c index ebc700257a..fb10c6763a 100644 --- a/cpukit/librpc/src/rpc/svc_simple.c +++ b/cpukit/librpc/src/rpc/svc_simple.c @@ -56,9 +56,9 @@ struct prog_lst { struct prog_lst *p_nxt; }; static void universal(); -#define proglst ((struct prog_lst *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_simple_proglst) -#define pl ((struct prog_lst *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_simple_pl) -#define transp ((SVCXPRT *)((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_simple_transp) +#define proglst ((struct prog_lst *)(rtems_rpc_task_variables)->svc_simple_proglst) +#define pl ((struct prog_lst *)(rtems_rpc_task_variables)->svc_simple_pl) +#define transp ((SVCXPRT *)(rtems_rpc_task_variables)->svc_simple_transp) int registerrpc(prognum, versnum, procnum, progname, inproc, outproc) -- cgit v1.2.3