--- ray/src/util/netproc.c	1997/09/18 16:10:19	2.6
+++ ray/src/util/netproc.c	2003/04/23 00:52:34	2.10
@@ -1,38 +1,17 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: netproc.c,v 2.10 2003/04/23 00:52:34 greg Exp $";
 #endif
-
 /*
  * Parallel network process handling routines
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/select.h>
 #include <signal.h>
 #include <fcntl.h>
+#include "selcall.h"
 #include "netproc.h"
 #include "paths.h"
 #include "vfork.h"
-					/* select call compatibility stuff */
-#ifndef FD_SETSIZE
-#include <sys/param.h>
-#define FD_SETSIZE	NOFILE		/* maximum # select file descriptors */
-#endif
-#ifndef FD_SET
-#ifndef NFDBITS
-#define NFDBITS		(8*sizeof(int))	/* number of bits per fd_mask */
-#endif
-#define	FD_SET(n, p)	((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
-#define	FD_CLR(n, p)	((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
-#define	FD_ISSET(n, p)	((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
-#ifndef BSD
-#define	bzero(d,n)	(void)memset(d,0,n)
-#endif
-#define FD_ZERO(p)	bzero((char *)(p), sizeof(*(p)))
-#endif
 
 PSERVER	*pslist = NULL;		/* global process server list */
 
@@ -48,7 +27,6 @@ static int	maxfd;		/* maximum assigned descriptor */
 
 extern char	*remsh;		/* externally defined remote shell program */
 
-extern char	*malloc(), *realloc();
 extern char	*getenv();
 
 
@@ -144,7 +122,7 @@ PSERVER	*ps;
 					/* remove server from list */
 	psp->next = ps->next;
 	pslist = pstart.next;
-	free((char *)ps);		/* free associated memory */
+	free((void *)ps);		/* free associated memory */
 }
 
 
@@ -267,7 +245,7 @@ int	fd;
 	if (pp->elen == 0)
 		pp->errs = (char *)malloc(nr+1);
 	else
-		pp->errs = (char *)realloc(pp->errs, pp->elen+nr+1);
+		pp->errs = (char *)realloc((void *)pp->errs, pp->elen+nr+1);
 	if (pp->errs == NULL) {
 		perror("malloc failed");
 		exit(1);
@@ -314,7 +292,7 @@ int	status;
 	close(pp->efd);				/* close error stream */
 	pindex[pp->efd] = NULL;
 	FD_CLR(pp->efd, &errdesc);
-	free((char *)pp->errs);
+	free((void *)pp->errs);
 	pp->com = NULL;				/* clear settings */
 	pp->pid = -1;
 	pp->efd = -1;