From 3e10a0da554eb6565f831cc2621b30657b8bf238 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Thu, 3 Jun 1993 17:29:24 +0000
Subject: [PATCH] Changed to work with vxWorks 5.1 and GCC 2.2.3.

---
 src/libCom/ezsSockSubr.c | 2 ++
 src/libCom/genSubr.c     | 2 ++
 src/libCom/genTaskSubr.c | 2 ++
 src/libCom/tsSubr.c      | 6 +++---
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/libCom/ezsSockSubr.c b/src/libCom/ezsSockSubr.c
index 6e69c6766..a89bb186f 100644
--- a/src/libCom/ezsSockSubr.c
+++ b/src/libCom/ezsSockSubr.c
@@ -177,7 +177,9 @@ char	*message;	/* O message from server (dimension of 80 assumed) */
 {
     struct sockaddr_in server;
     struct hostent *hp;
+#ifndef vxWorks
     struct hostent *gethostbyname();
+#endif
     int		i;
 
     assert(pServerSock != NULL);
diff --git a/src/libCom/genSubr.c b/src/libCom/genSubr.c
index 89170df4b..088810281 100644
--- a/src/libCom/genSubr.c
+++ b/src/libCom/genSubr.c
@@ -328,6 +328,7 @@ void	(* handler)();	/* I pointer to signal handler */
 }
 
 #ifdef vxWorks
+#ifndef V5_vxWorks
 /*+/subr**********************************************************************
 * NAME	perror - print message corresponding to errno
 *
@@ -345,6 +346,7 @@ char    *str;	/* I string to print in conjunction with error message */
     printErrno(0);
 }
 #endif
+#endif
 
 int doMatch();
 
diff --git a/src/libCom/genTaskSubr.c b/src/libCom/genTaskSubr.c
index 6defbb629..bb78e765e 100644
--- a/src/libCom/genTaskSubr.c
+++ b/src/libCom/genTaskSubr.c
@@ -98,6 +98,7 @@
 *----------------------------------------------------------------------------*/
 
 #ifdef vxWorks
+#ifndef V5_vxWorks
     FUNCPTR signal(sig, func)
     int	sig;
     FUNCPTR	func;
@@ -111,6 +112,7 @@
 	return ovec.sv_handler;
     }
 #endif
+#endif
 
 /*----------------------------------------------------------------------------
 * taskSpawn()
diff --git a/src/libCom/tsSubr.c b/src/libCom/tsSubr.c
index f85bffb3d..c46e4a7a6 100644
--- a/src/libCom/tsSubr.c
+++ b/src/libCom/tsSubr.c
@@ -126,8 +126,9 @@
 #define TS_PRIVATE_DATA
 #include <tsDefs.h>
 
-void tsStampFromLocal();
-void tsStampToLocal();
+static void tsStampFromLocal();
+static void tsStampToLocal();
+static void tsStampToLocalZone();
 
 static int needToInitMinWest=1;
 static long tsMinWest=TS_MIN_WEST;
@@ -710,7 +711,6 @@ unsigned long interval;	/* I rounding interval, in seconds */
     return retStat;
 }
 
-void tsStampToLocalZone();
 /*+/internal******************************************************************
 * NAME	tsStampFromLocal - convert time stamp to local time
 *