diff --git a/src/ioc/rsrv/caservertask.c b/src/ioc/rsrv/caservertask.c index 83a19f510..37c721f8a 100644 --- a/src/ioc/rsrv/caservertask.c +++ b/src/ioc/rsrv/caservertask.c @@ -489,7 +489,6 @@ int rsrv_init (void) clientQlock = epicsMutexMustCreate(); - ellInit ( &clientQ ); freeListInitPvt ( &rsrvClientFreeList, sizeof(struct client), 8 ); freeListInitPvt ( &rsrvChanFreeList, sizeof(struct channel_in_use), 512 ); freeListInitPvt ( &rsrvEventFreeList, sizeof(struct event_ext), 512 ); diff --git a/src/ioc/rsrv/server.h b/src/ioc/rsrv/server.h index d2a1cf3f4..7ace5ad7c 100644 --- a/src/ioc/rsrv/server.h +++ b/src/ioc/rsrv/server.h @@ -167,7 +167,7 @@ enum ctl {ctlInit, ctlRun, ctlPause, ctlExit}; /* NOTE: external used so they remember the state across loads */ #ifdef GLBLSOURCE # define GLBLTYPE -# define GLBLTYPE_INIT(A) +# define GLBLTYPE_INIT(A) = A #else # define GLBLTYPE extern # define GLBLTYPE_INIT(A) @@ -185,8 +185,7 @@ enum ctl {ctlInit, ctlRun, ctlPause, ctlExit}; GLBLTYPE int CASDEBUG; GLBLTYPE unsigned short ca_server_port, ca_udp_port, ca_beacon_port; -GLBLTYPE ELLLIST clientQ; /* (TCP clients) locked by clientQlock */ -GLBLTYPE ELLLIST clientQudp; /* locked by clientQlock */ +GLBLTYPE ELLLIST clientQ GLBLTYPE_INIT(ELLLIST_INIT); GLBLTYPE ELLLIST servers; /* rsrv_iface_config::node, read-only after rsrv_init() */ GLBLTYPE ELLLIST beaconAddrList; GLBLTYPE SOCKET beaconSocket;