From 6e79e7fded6db243d3ee609908c9fa11738cedae Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Wed, 11 Aug 1993 16:43:05 +0000
Subject: [PATCH] removed EPICS_V2 and V5vxWorks definitions

---
 src/libCom/ezsSockSubr.c |  7 ++-----
 src/libCom/genSubr.c     | 22 +---------------------
 src/libCom/genTaskSubr.c | 23 +----------------------
 3 files changed, 4 insertions(+), 48 deletions(-)

diff --git a/src/libCom/ezsSockSubr.c b/src/libCom/ezsSockSubr.c
index 9327b9583..5f247e577 100644
--- a/src/libCom/ezsSockSubr.c
+++ b/src/libCom/ezsSockSubr.c
@@ -30,6 +30,7 @@
  *  .02 09-05-91 joh	updated for v5 vxWorks; included systime.h for utime.h
  *  .03 12-08-91 rac	added a comment for ezsFopenToFd
  *  .04 10-09-92 rac	use SO_REUSEADDR with socket
+ *  .05 08-11-93 mrk	removed V5_vxWorks
  *
  * make options
  *	-DvxWorks	makes a version for VxWorks
@@ -74,11 +75,7 @@
 #   include <ioLib.h>
 #   include <taskLib.h>
 #   include <types.h>
-#   ifdef V5_vxWorks
-#	include <systime.h>
-#   else
-#	include <utime.h>
-#   endif
+#   include <systime.h>
 #   include <socket.h>
 #   include <inetLib.h>
 #   include <in.h>
diff --git a/src/libCom/genSubr.c b/src/libCom/genSubr.c
index 088810281..fb0bb4403 100644
--- a/src/libCom/genSubr.c
+++ b/src/libCom/genSubr.c
@@ -28,6 +28,7 @@
  * .00	03-29-90	rac	initial version
  * .01	06-18-91	rac	installed in SCCS
  * .02	01-29-92	rac	added wildMatch function
+ * .03	08-11-93	mrk	removed ifdef V5_vxWorks
  *
  * make options
  *	-DvxWorks	makes a version for VxWorks
@@ -327,27 +328,6 @@ void	(* handler)();	/* I pointer to signal handler */
     (void)signal(SIGPIPE, handler);	/* write to disconnected socket */
 }
 
-#ifdef vxWorks
-#ifndef V5_vxWorks
-/*+/subr**********************************************************************
-* NAME	perror - print message corresponding to errno
-*
-* DESCRIPTION
-*	Under VxWorks, provides the capability provided by perror() under
-*	UNIX.  (This routine isn't present in genLib except for VxWorks
-*	version.)
-*
-*-*/
-perror(str)
-char    *str;	/* I string to print in conjunction with error message */
-{
-    if (str != NULL)
-	(void)printf("%s: ", str);
-    printErrno(0);
-}
-#endif
-#endif
-
 int doMatch();
 
 /*+/subr**********************************************************************
diff --git a/src/libCom/genTaskSubr.c b/src/libCom/genTaskSubr.c
index 33c2ed8ed..df0a3a07e 100644
--- a/src/libCom/genTaskSubr.c
+++ b/src/libCom/genTaskSubr.c
@@ -34,6 +34,7 @@
  * .00	02-03-90	rac	initial version
  * .01	06-18-91	rac	installed in SCCS
  * .02	06-28-91	rac	don't do lwp_fpset for sun4
+ * .03	08-11-93	mrk	removed ifdef V5_vxWorks
  *
  * make options
  *	-DvxWorks	makes a version for VxWorks
@@ -98,28 +99,6 @@
 	    return OK;
     }
 #endif
-
-/*-----------------------------------------------------------------------------
-* signal()
-*----------------------------------------------------------------------------*/
-
-#ifdef vxWorks
-#ifndef V5_vxWorks
-    FUNCPTR signal(sig, func)
-    int	sig;
-    FUNCPTR	func;
-    {
-	struct sigvec vec;
-	struct sigvec ovec;
-
-	vec.sv_handler = func;
-	if (sigvec(sig, &vec, &ovec) == -1)
-	    return (FUNCPTR)(-1);
-	return ovec.sv_handler;
-    }
-#endif
-#endif
-
 /*----------------------------------------------------------------------------
 * taskSpawn()
 *---------------------------------------------------------------------------*/