From cc40e5989e5a30700cf20a389f778664ee0d4a33 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Wed, 15 Mar 2000 14:19:52 +0000
Subject: [PATCH] changes to build on solaris and vxWorks

---
 src/rsrv/camessage.c     | 2 ++
 src/rsrv/camsgtask.c     | 1 +
 src/rsrv/caserverio.c    | 1 +
 src/rsrv/caservertask.c  | 5 ++++-
 src/rsrv/cast_server.c   | 2 ++
 src/rsrv/online_notify.c | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/rsrv/camessage.c b/src/rsrv/camessage.c
index fee8e86f8..ad1f94f7a 100644
--- a/src/rsrv/camessage.c
+++ b/src/rsrv/camessage.c
@@ -40,10 +40,12 @@
 #include "special.h"
 #include "freeList.h"
 #include "caerr.h"
+#include "db_field_log.h"
 #include "dbEvent.h"
 #include "dbCommon.h"
 #include "db_field_log.h"
 #include "asLib.h"
+#include "callback.h"
 #include "asDbLib.h"
 
 #include "server.h"
diff --git a/src/rsrv/camsgtask.c b/src/rsrv/camsgtask.c
index e4e648f96..55a0181d5 100644
--- a/src/rsrv/camsgtask.c
+++ b/src/rsrv/camsgtask.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "dbDefs.h"
 #include "osiSock.h"
 #include "tsStamp.h"
 #include "errlog.h"
diff --git a/src/rsrv/caserverio.c b/src/rsrv/caserverio.c
index 95578c991..5effb0183 100644
--- a/src/rsrv/caserverio.c
+++ b/src/rsrv/caserverio.c
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <errno.h>
 
+#include "dbDefs.h"
 #include "osiSock.h"
 #include "tsStamp.h"
 #include "errlog.h"
diff --git a/src/rsrv/caservertask.c b/src/rsrv/caservertask.c
index ce9afa7b5..7688622a3 100644
--- a/src/rsrv/caservertask.c
+++ b/src/rsrv/caservertask.c
@@ -44,6 +44,8 @@
 #include "addrList.h"
 #include "freeList.h"
 #include "errlog.h"
+#include "db_field_log.h"
+#include "dbAddr.h"
 #include "dbEvent.h"
 #include "dbCommon.h"
 
@@ -323,7 +325,8 @@ LOCAL int req_server (void)
                 continue;
             }
             id = threadCreate ("CAclient", threadPriorityChannelAccessClient,
-                    threadGetStackSize (threadStackBig), camsgtask, (void *)pClient);
+                    threadGetStackSize (threadStackBig),
+                    (THREADFUNC)camsgtask, (void *)pClient);
             if (id==0) {
                 destroy_client (pClient);
                 errlogPrintf("CAS: task creation for new client failed because \"%s\"\n",
diff --git a/src/rsrv/cast_server.c b/src/rsrv/cast_server.c
index f54416e10..d798c3f26 100644
--- a/src/rsrv/cast_server.c
+++ b/src/rsrv/cast_server.c
@@ -50,6 +50,7 @@
 #include <errno.h>
 
 #include "osiSock.h"
+#include "dbDefs.h"
 #include "errlog.h"
 #include "taskwd.h"
 #include "tsStamp.h"
@@ -306,4 +307,5 @@ int cast_server(void)
             clean_addrq ();
         }
     }
+    return(0);
 }
diff --git a/src/rsrv/online_notify.c b/src/rsrv/online_notify.c
index c7f27201f..b5722a26b 100644
--- a/src/rsrv/online_notify.c
+++ b/src/rsrv/online_notify.c
@@ -40,6 +40,7 @@
 /*
  *  EPICS includes
  */
+#include "dbDefs.h"
 #include "osiSock.h"
 #include "osiPoolStatus.h"
 #include "tsStamp.h"