diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index 87d959f16..c582f0c9d 100644 --- a/src/rsrv/Makefile +++ b/src/rsrv/Makefile @@ -5,6 +5,8 @@ include $(TOP)/configure/CONFIG USR_INCLUDES = -I../../ca +INC += rsrv.h + LIBSRCS += caserverio.c LIBSRCS += caservertask.c LIBSRCS += camsgtask.c diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c index 7688622a3..663779822 100644 --- a/src/rsrv/caservertask.c +++ b/src/rsrv/caservertask.c @@ -339,9 +339,9 @@ LOCAL int req_server (void) } /* - * rsrv_init() + * rsrv_init () */ -int rsrv_init() +int rsrv_init () { clientQlock = semMutexMustCreate(); diff --git a/src/rsrv/rsrv.h b/src/rsrv/rsrv.h new file mode 100644 index 000000000..82c6df19e --- /dev/null +++ b/src/rsrv/rsrv.h @@ -0,0 +1,43 @@ + +/* + * $Id$ + * + * Author: Jeffrey O. Hill + * hill@luke.lanl.gov + * (505) 665 1831 + * Date: 5-88 + * + * Experimental Physics and Industrial Control System (EPICS) + * + * Copyright 1991, the Regents of the University of California, + * and the University of Chicago Board of Governors. + * + * This software was produced under U.S. Government contracts: + * (W-7405-ENG-36) at the Los Alamos National Laboratory, + * and (W-31-109-ENG-38) at Argonne National Laboratory. + * + * Initial development by: + * The Controls and Automation Group (AT-8) + * Ground Test Accelerator + * Accelerator Technology Division + * Los Alamos National Laboratory + * + * Co-developed with + * The Controls and Computing Group + * Accelerator Systems Division + * Advanced Photon Source + * Argonne National Laboratory + * + */ + +#ifndef rsrvh +#define rsrvh + +#include "shareLib.h" + +epicsShareFunc int rsrv_init (void); + +#define RSRV_OK 0 +#define RSRV_ERROR (-1) + +#endif /*rsrvh */ diff --git a/src/rsrv/server.h b/src/rsrv/server.h index 67540e28b..a4a1e30c3 100644 --- a/src/rsrv/server.h +++ b/src/rsrv/server.h @@ -30,6 +30,10 @@ #ifndef INCLserverh #define INCLserverh +#ifdef epicsExportSharedSymbols +# error suspect that libCom is being exported from rsrv? +#endif /* ifdef epicsExportSharedSymbols */ + #include "osiThread.h" #include "bucketLib.h" #include "asLib.h" @@ -38,8 +42,8 @@ #include "caProto.h" #include "ellLib.h" -#define RSRV_OK 0 -#define RSRV_ERROR (-1) +#define epicsExportSharedSymbols +#include "rsrv.h" #define LOCAL static