From: deraadt <deraadt@openbsd.org>
Date: Mon, 17 Feb 1997 09:11:15 +0000 (+0000)
Subject: __OpenBSD__
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a80cbd0fd186bae6b3ca5543d72edbca4ac65748;p=openbsd

__OpenBSD__
---

diff --git a/sbin/ipfstat/fils.c b/sbin/ipfstat/fils.c
index 076f0fe815e..32b80820d62 100644
--- a/sbin/ipfstat/fils.c
+++ b/sbin/ipfstat/fils.c
@@ -36,13 +36,13 @@
 #include <resolv.h>
 #include "ipf.h"
 #include "kmem.h"
-#ifdef	__NetBSD__
+#if defined(__NetBSD__) || defined(__OpenBSD__)
 #include <paths.h>
 #endif
 
 #if !defined(lint) && defined(LIBC_SCCS)
 static	char	sccsid[] = "@(#)fils.c	1.21 4/20/96 (C) 1993-1996 Darren Reed";
-static	char	rcsid[] = "$Id: fils.c,v 1.8 1997/02/11 22:23:41 kstailey Exp $";
+static	char	rcsid[] = "$Id: fils.c,v 1.9 1997/02/17 09:13:11 deraadt Exp $";
 #endif
 #ifdef	_PATH_UNIX
 #define	VMUNIX	_PATH_UNIX
diff --git a/usr.sbin/amd/fsinfo/fsi_util.c b/usr.sbin/amd/fsinfo/fsi_util.c
index 88b0179955d..2695ba6202b 100644
--- a/usr.sbin/amd/fsinfo/fsi_util.c
+++ b/usr.sbin/amd/fsinfo/fsi_util.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)fsi_util.c	8.1 (Berkeley) 6/6/93
- *	$Id: fsi_util.c,v 1.2 1997/01/31 14:42:11 graichen Exp $
+ *	$Id: fsi_util.c,v 1.3 1997/02/17 09:11:25 deraadt Exp $
  */
 
 #include "../fsinfo/fsinfo.h"
@@ -83,7 +83,7 @@ char *s, *s1, *s2, *s3, *s4;
 	exit(1);
 }
 
-#ifndef __NetBSD__
+#if !(defined(__NetBSD__) || defined(__OpenBSD__))
 /*
  * Dup a string
  */
@@ -98,7 +98,7 @@ char *s;
 
 	return sp;
 }
-#endif /* __NetBSD__ */
+l#endif /* !(defined(__NetBSD__) || defined(__OpenBSD)) */
 
 /*
  * Debug log
diff --git a/usr.sbin/bootpd/getether.c b/usr.sbin/bootpd/getether.c
index 12ac7d0832d..d9c7686737d 100644
--- a/usr.sbin/bootpd/getether.c
+++ b/usr.sbin/bootpd/getether.c
@@ -156,7 +156,7 @@ getether(ifname, eap)
 }
 
 #define	GETETHER
-#endif /* __NetBSD__ */
+#endif /* __NetBSD__ || __OpenBSD__ */
 
 
 #ifdef	SVR4
diff --git a/usr.sbin/gspa/gspa/gsp_ass.h b/usr.sbin/gspa/gspa/gsp_ass.h
index 4201de43c94..0b50b0858e3 100644
--- a/usr.sbin/gspa/gspa/gsp_ass.h
+++ b/usr.sbin/gspa/gspa/gsp_ass.h
@@ -163,7 +163,7 @@ extern int lineno;
 extern int err_count;
 extern char line[], *lineptr;
 
-#if defined(sparc) && !defined(__NetBSD__)
+#if defined(sparc) && !(defined(__NetBSD__) || defined(__OpenBSD__))
 #include <alloca.h>
 #else
 #ifdef __GNUC__