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/include/rpc/rpc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'cpukit/librpc/include/rpc') diff --git a/cpukit/librpc/include/rpc/rpc.h b/cpukit/librpc/include/rpc/rpc.h index f68dc1be89..74b97e6b1d 100644 --- a/cpukit/librpc/include/rpc/rpc.h +++ b/cpukit/librpc/include/rpc/rpc.h @@ -100,7 +100,7 @@ int rtems_rpc_start_portmapper (int priority); * Group all global and static variables into a single spot. * This area will be allocated on a per-task basis */ -struct rtems_rpc_task_variables { +struct _rtems_rpc_task_variables { int svc_svc_maxfd; fd_set svc_svc_fdset; void *svc_xports; @@ -125,12 +125,12 @@ struct rtems_rpc_task_variables { void *svc_auths_Auths; }; -extern void *rtems_rpc_task_variables; +extern struct _rtems_rpc_task_variables *rtems_rpc_task_variables; -#define svc_maxfd (((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_svc_maxfd) -#define svc_fdset (((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc_svc_fdset) -#define __svc_fdsetsize (((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc__svc_fdsetsize) -#define __svc_fdset (fd_set *)(((struct rtems_rpc_task_variables *)rtems_rpc_task_variables)->svc__svc_fdset) +#define svc_maxfd (rtems_rpc_task_variables->svc_svc_maxfd) +#define svc_fdset ((rtems_rpc_task_variables)->svc_svc_fdset) +#define __svc_fdsetsize (rtems_rpc_task_variables->svc__svc_fdsetsize) +#define __svc_fdset (fd_set *)(rtems_rpc_task_variables->svc__svc_fdset) #endif /* _RTEMS_RPC_INTERNAL_ */ -- cgit v1.2.3