From e0e363cc0bb6ee37325502d47b004f8b65f566d1 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Wed, 2 Jun 1993 17:21:04 +0000
Subject: [PATCH] Modified to support vxWorks5.1 and GNU2.2.3 cross compiler.

---
 src/ca/access.c       | 16 ++++++++--------
 src/ca/flow_control.c |  4 +---
 src/ca/iocinf.c       | 12 ++++++------
 src/ca/iocinf.h       |  2 +-
 src/ca/repeater.c     |  6 +++---
 src/ca/service.c      | 10 ++++------
 6 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/ca/access.c b/src/ca/access.c
index 2952479ce..1694a67f3 100644
--- a/src/ca/access.c
+++ b/src/ca/access.c
@@ -136,11 +136,11 @@ static char *sccsId = "$Id$\t$Date$";
  */
 #define DB_TEXT_GLBLSOURCE
 #include 		<cadef.h>
-#include		<net_convert.h>
 
 #include		<db_access.h>
 #include		<iocmsg.h>
 #include 		<iocinf.h>
+#include		<net_convert.h>
 
 
 /****************************************************************/
@@ -212,17 +212,17 @@ static struct extmsg	nullmsg;
 void 		ca_default_exception_handler();
 void		*db_init_events();
 void		ca_default_exception_handler();
-void 		spawn_repeater();
-int		check_for_fp();
-void    	issue_get_callback();
-void    	ca_event_handler();
-void 		ca_pend_io_cleanup();
-int		ca_add_task_variable();
+static void 	spawn_repeater();
+static int	check_for_fp();
+static void    	issue_get_callback();
+static void    	ca_event_handler();
+static void	ca_pend_io_cleanup();
+static int	ca_add_task_variable();
 int		ca_import();
 struct extmsg 	*cac_alloc_msg();
 #ifdef vxWorks
 void 		ca_task_exit_tid();
-void    	ca_task_exit_tcb();
+static void    	ca_task_exit_tcb();
 #else
 void 		ca_process_exit();
 #endif
diff --git a/src/ca/flow_control.c b/src/ca/flow_control.c
index dd7d4e5ff..ebd2f5f78 100644
--- a/src/ca/flow_control.c
+++ b/src/ca/flow_control.c
@@ -40,9 +40,7 @@ static char	*sccsId = "$Id$\t$Date$";
 #	include		<ioLib.h>
 #	include		<socket.h>
 #	include		<ioctl.h>
-#	ifdef V5_vxWorks
-#		include	<vxTypes.h>
-#	else
+#	ifndef V5_vxWorks
 #		include	<types.h>
 #	endif
 #elif defined(VMS)
diff --git a/src/ca/iocinf.c b/src/ca/iocinf.c
index a9dd4e94a..f6ea31866 100644
--- a/src/ca/iocinf.c
+++ b/src/ca/iocinf.c
@@ -117,11 +117,11 @@ static char *sccsId = "$Id$\t$Date$";
 static struct timeval notimeout = {0,0};
 
 void 	close_ioc();
-void	recv_msg();
-void	tcp_recv_msg();
-void	udp_recv_msg();
-void	notify_ca_repeater();
-int	cac_send_msg_piiu();
+static void	recv_msg();
+static void	tcp_recv_msg();
+static void	udp_recv_msg();
+static void	notify_ca_repeater();
+static int	cac_send_msg_piiu();
 #ifdef VMS
 void   	vms_recv_msg_ast();
 #endif
@@ -544,7 +544,7 @@ struct ioc_in_use		*piiu;
   	}
 # 	elif defined(vxWorks)
   	{  
-      		void	recv_task();
+      		static void	recv_task();
       		int 	pri;
       		char	name[15];
 
diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h
index 9f1d37d7c..69dc7580f 100644
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -65,7 +65,7 @@ static char	*iocinfhSccsId = "$Id$\t$Date$";
 #	include	<netinet/in.h>
 #elif defined(vxWorks)
 #	ifdef V5_vxWorks
-#  		include	<vxTypes.h>
+#  		include	<vxWorks.h>
 #	else
 #  		include	<types.h>
 #	endif
diff --git a/src/ca/repeater.c b/src/ca/repeater.c
index c15cf3dd7..dc06e852b 100644
--- a/src/ca/repeater.c
+++ b/src/ca/repeater.c
@@ -101,9 +101,9 @@ LIST	client_list;
 static
 char	buf[MAX_UDP]; 
 
-int 	clean_client();
-int	ca_repeater();
-int	local_addr();
+static int 	clean_client();
+static int	ca_repeater();
+int		local_addr();
 
 #define NTRIES 100
 
diff --git a/src/ca/service.c b/src/ca/service.c
index bfb7da834..1cb23d3f9 100644
--- a/src/ca/service.c
+++ b/src/ca/service.c
@@ -78,9 +78,7 @@ static char *sccsId = "$Id$\t$Date$";
 #	include		<stdio.h>
 #elif defined(vxWorks)
 #	include		<vxWorks.h>
-#	ifdef V5_vxWorks
-#		include	<vxTypes.h>
-#	else
+#	ifndef V5_vxWorks
 #		include	<types.h>
 #	endif
 #else
@@ -89,14 +87,14 @@ static char *sccsId = "$Id$\t$Date$";
 
 #include	<os_depen.h>
 #include 	<cadef.h>
-#include 	<net_convert.h>
 #include	<db_access.h>
 #include	<iocmsg.h>
 #include 	<iocinf.h>
+#include 	<net_convert.h>
 
-void 		reconnect_channel();
+static void 	reconnect_channel();
 void		ca_request_event();
-int		client_channel_exists();
+static int	client_channel_exists();
 
 #define BUFSTAT 	ca_printf("CAC: expected %d left %d\n",msgcnt,*pbufcnt);