summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2002-08-14 01:37:22 +0000
committerrwatson <rwatson@FreeBSD.org>2002-08-14 01:37:22 +0000
commitf183894893c95323406ff434337f2d2ca502be5b (patch)
tree6d2f559f037904bd1ccabda24098acdee2866c51
parent20c1b55c0bf8d21af127bf49d9fa72117edaf7d3 (diff)
downloadFreeBSD-src-f183894893c95323406ff434337f2d2ca502be5b.zip
FreeBSD-src-f183894893c95323406ff434337f2d2ca502be5b.tar.gz
Move to nested include of _label.h instead of mac.h, reducing namespace
pollution. Obtained from: TrustedBSD Project Sponsored by: DARPA, NAI Labs Suggested by: bde
-rw-r--r--sys/net/bpfdesc.h2
-rw-r--r--sys/net/if_var.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index a4c03a8..2dd6f43 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -43,8 +43,8 @@
#ifndef _NET_BPFDESC_H_
#define _NET_BPFDESC_H_
+#include <sys/_label.h>
#include <sys/callout.h>
-#include <sys/mac.h>
#include <sys/selinfo.h>
/*
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 6390ee1..f36091b 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -74,7 +74,7 @@ struct socket;
struct ether_header;
#endif
-#include <sys/mac.h> /* struct label */
+#include <sys/_label.h> /* struct label */
#include <sys/queue.h> /* get TAILQ macros */
#ifdef _KERNEL
OpenPOWER on IntegriCloud