From 2a4492056bc310ffcbc769616434b339ec10f0ea Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Tue, 29 Feb 2000 16:04:50 +0000
Subject: [PATCH] changes for building win32 dlls

---
 src/rsrv/camessage.c     |  3 ++-
 src/rsrv/camsgtask.c     |  2 ++
 src/rsrv/caserverio.c    |  2 ++
 src/rsrv/caservertask.c  |  2 ++
 src/rsrv/cast_server.c   |  2 ++
 src/rsrv/online_notify.c |  2 ++
 src/rsrv/server.h        | 20 --------------------
 src/rsrv/serverInclude.h | 40 ++++++++++++++++++++++++++++++++++++++++
 8 files changed, 52 insertions(+), 21 deletions(-)
 create mode 100644 src/rsrv/serverInclude.h

diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index a7953a865..bcbb547ba 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -41,7 +41,8 @@
 #include "ellLib.h"
 #include "freeList.h"
 #include "caerr.h"
-
+#include "serverInclude.h"
+#define epicsExportSharedSymbols
 #include "server.h"
 
 static caHdr nill_msg;
diff --git a/src/rsrv/camsgtask.c b/src/rsrv/camsgtask.c
index 4bfe3ba13..0a767afcc 100644
--- a/src/rsrv/camsgtask.c
+++ b/src/rsrv/camsgtask.c
@@ -41,6 +41,8 @@
 #include "ellLib.h"
 #include "taskwd.h"
 #include "db_access.h"
+#include "serverInclude.h"
+#define epicsExportSharedSymbols
 #include "server.h"
 
 /*
diff --git a/src/rsrv/caserverio.c b/src/rsrv/caserverio.c
index 0da00ad77..38e6ff994 100644
--- a/src/rsrv/caserverio.c
+++ b/src/rsrv/caserverio.c
@@ -36,6 +36,8 @@
 #include "tsStamp.h"
 #include "ellLib.h"
 #include "errlog.h"
+#include "serverInclude.h"
+#define epicsExportSharedSymbols
 #include "server.h"
 
 /*
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index db6fa973c..01a3c26ce 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -48,6 +48,8 @@
 #include "freeList.h"
 #include "errlog.h"
 
+#include "serverInclude.h"
+#define epicsExportSharedSymbols
 #define GLBLSOURCE
 #include "server.h"
 
diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c
index 450e5314c..2171ef634 100644
--- a/src/rsrv/cast_server.c
+++ b/src/rsrv/cast_server.c
@@ -58,6 +58,8 @@
 #include "db_access.h"
 #include "envDefs.h"
 #include "freeList.h"
+#include "serverInclude.h"
+#define epicsExportSharedSymbols
 #include "server.h"
     
 #define     TIMEOUT 60.0 /* sec */
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index 471879e53..4ceee69b1 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -46,6 +46,8 @@
 #include "tsStamp.h"
 #include "errlog.h"
 #include "envDefs.h"
+#include "serverInclude.h"
+#define epicsExportSharedSymbols
 #include "server.h"
 
 /*
diff --git a/src/rsrv/server.h b/src/rsrv/server.h
index babde4411..ce460a1d5 100644
--- a/src/rsrv/server.h
+++ b/src/rsrv/server.h
@@ -38,26 +38,6 @@ static char *serverhSccsId = "@(#) $Id$";
 #       define HDRVERSIONID(NAME,VERS)
 #endif /*CAS_VERSION_GLOBAL*/
 
-#include "epicsAssert.h"
-
-#include "ellLib.h"
-#include "osiSem.h"
-#include "osiThread.h"
-
-#include "osiSock.h"
-#include "addrList.h"
-#include "net_convert.h"
-
-#include "dbDefs.h"
-#include "db_access.h"
-#include "dbEvent.h"
-#include "caProto.h"
-#include "bucketLib.h"
-#include "taskwd.h"
-
-#include "asLib.h"
-#include "asDbLib.h"
-
 #define RSRV_OK 0
 #define RSRV_ERROR (-1)
 
diff --git a/src/rsrv/serverInclude.h b/src/rsrv/serverInclude.h
new file mode 100644
index 000000000..2dfaa584c
--- /dev/null
+++ b/src/rsrv/serverInclude.h
@@ -0,0 +1,40 @@
+/*serverInclude.h */
+/*****************************************************************
+                          COPYRIGHT NOTIFICATION
+*****************************************************************
+
+(C)  COPYRIGHT 1993 UNIVERSITY OF CHICAGO
+
+This software was developed under a United States Government license
+described on the COPYRIGHT_UniversityOfChicago file included as part
+of this distribution.
+**********************************************************************/
+
+
+#ifndef INCLserverIncludeh
+#define INCLserverIncludeh
+
+
+#include "epicsAssert.h"
+#include "shareLib.h"
+#include "ellLib.h"
+#include "callback.h"
+#include "osiSem.h"
+#include "osiThread.h"
+#include "osiSock.h"
+#include "addrList.h"
+#include "net_convert.h"
+#include "dbDefs.h"
+#include "dbAddr.h"
+#include "db_access.h"
+#include "dbCommon.h"
+#include "dbNotify.h"
+#include "db_field_log.h"
+#include "dbEvent.h"
+#include "caProto.h"
+#include "bucketLib.h"
+#include "taskwd.h"
+#include "asLib.h"
+#include "asDbLib.h"
+
+#endif /*INCLserverIncludeh*/