From 8b95d77cfa11d3a73438aba6c0d951c4dbb8405d Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sat, 7 Oct 2017 20:05:20 +0000
Subject: delete #ifdef SYSV code, along with a beautiful #define bcopy memcpy

---
 usr.sbin/mrouted/defs.h | 9 ---------
 usr.sbin/mrouted/main.c | 4 ----
 2 files changed, 13 deletions(-)

(limited to 'usr.sbin/mrouted')

diff --git a/usr.sbin/mrouted/defs.h b/usr.sbin/mrouted/defs.h
index f4d3a6acc66..127e50e7e99 100644
--- a/usr.sbin/mrouted/defs.h
+++ b/usr.sbin/mrouted/defs.h
@@ -21,9 +21,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#ifdef SYSV
-#include <sys/sockio.h>
-#endif
 #include <sys/time.h>
 #include <net/if.h>
 #include <netinet/in.h>
@@ -85,12 +82,6 @@ typedef void (*ihfunc_t)(int);
 #define BIT_TST(X,n)     ((X) & 1 << (n))
 #endif /* RSRR */
 
-#ifdef SYSV
-#define bcopy(a, b, c)	memcpy(b, a, c)
-#define bzero(s, n)	memset((s), 0, (n))
-#define signal(s,f)	sigset(s,f)
-#endif
-
 /*
  * External declarations for global variables and functions.
  */
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 144fa558092..2d3334b3ac8 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -135,9 +135,6 @@ usage:	fprintf(stderr,
 	(void)open("/dev/null", O_RDONLY);
 	(void)dup2(0, 1);
 	(void)dup2(0, 2);
-#ifdef SYSV
-	(void)setpgrp();
-#else
 #ifdef TIOCNOTTY
 	t = open("/dev/tty", O_RDWR);
 	if (t >= 0) {
@@ -147,7 +144,6 @@ usage:	fprintf(stderr,
 #else
 	if (setsid() < 0)
 	    perror("setsid");
-#endif
 #endif
     }
     else
-- 
cgit v1.2.3