summaryrefslogtreecommitdiffstats
path: root/sys/netinet6/raw_ipv6.c
diff options
context:
space:
mode:
authorangelos <angelos@openbsd.org>1999-12-10 10:04:27 +0000
committerangelos <angelos@openbsd.org>1999-12-10 10:04:27 +0000
commit58aa7d74bcc928aa05ad0e97ff825b2877a57993 (patch)
treee8f799ad01c2f7921641cabf998ab30b2f79d02e /sys/netinet6/raw_ipv6.c
parentsorry angelos, they are not used any more :-P (diff)
downloadwireguard-openbsd-58aa7d74bcc928aa05ad0e97ff825b2877a57993.tar.xz
wireguard-openbsd-58aa7d74bcc928aa05ad0e97ff825b2877a57993.zip
Remove remaining unnecessary ifdefs (itojun will hate me for this :-)
Diffstat (limited to 'sys/netinet6/raw_ipv6.c')
-rw-r--r--sys/netinet6/raw_ipv6.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/netinet6/raw_ipv6.c b/sys/netinet6/raw_ipv6.c
index 3adf99b2002..24d18cae1cf 100644
--- a/sys/netinet6/raw_ipv6.c
+++ b/sys/netinet6/raw_ipv6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: raw_ipv6.c,v 1.6 1999/12/10 08:53:18 angelos Exp $ */
+/* $OpenBSD: raw_ipv6.c,v 1.7 1999/12/10 10:04:29 angelos Exp $ */
/*
%%% copyright-nrl-95
This software is Copyright 1995-1998 by Randall Atkinson, Ronald Lee,
@@ -43,7 +43,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
* SUCH DAMAGE.
*
* @(#)raw_ip.c 8.7 (Berkeley) 5/15/95
- * $Id: raw_ipv6.c,v 1.6 1999/12/10 08:53:18 angelos Exp $
+ * $Id: raw_ipv6.c,v 1.7 1999/12/10 10:04:29 angelos Exp $
*/
#include <sys/param.h>
@@ -71,9 +71,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#include <netinet6/ip6_var.h>
#include <netinet6/icmp6.h>
-#if __OpenBSD__
#undef IPSEC
-#endif /* __OpenBSD__ */
/*
* Globals
@@ -577,13 +575,13 @@ rip6_ctloutput (op, so, level, optname, m)
return ip6_ctloutput(op, so, level, optname, m);
}
-#if __GNUC__ && __GNUC__ >= 2 && __OPTIMIZE__ && !__FreeBSD__
+#if __GNUC__ && __GNUC__ >= 2 && __OPTIMIZE__
#define MAYBESTATIC static
#define MAYBEINLINE __inline__
-#else /* __GNUC__ && __GNUC__ >= 2 && __OPTIMIZE__ && !__FreeBSD__ */
+#else /* __GNUC__ && __GNUC__ >= 2 && __OPTIMIZE__ */
#define MAYBESTATIC
#define MAYBEINLINE
-#endif /* __GNUC__ && __GNUC__ >= 2 && __OPTIMIZE__ && !__FreeBSD__ */
+#endif /* __GNUC__ && __GNUC__ >= 2 && __OPTIMIZE__ */
MAYBESTATIC MAYBEINLINE int rip6_usrreq_attach(struct socket *so, int proto)
{