From owner-p4-projects  Sat Apr 20 20:18:45 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B5D1B37B416; Sat, 20 Apr 2002 20:18:35 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id CC15437B404
	for <perforce@freebsd.org>; Sat, 20 Apr 2002 20:18:34 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3L3IYK33057
	for perforce@freebsd.org; Sat, 20 Apr 2002 20:18:34 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 20 Apr 2002 20:18:34 -0700 (PDT)
Message-Id: <200204210318.g3L3IYK33057@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 10075 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10075

Change 10075 by rwatson@rwatson_tislabs on 2002/04/20 20:18:09

	mbuf.h no longer requires explicit include of mac.h: remove all
	mac.h includes from ipfilter so that there are no diffs present
	from the main tree.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#5 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#6 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#6 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#5 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#5 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#7 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.c#6 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#5 edit
... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#5 (text+ko) ====

@@ -39,7 +39,6 @@
 #endif
 #if !defined(__SVR4) && !defined(__svr4__)
 # ifndef linux
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # endif
 #else

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#6 (text+ko) ====

@@ -31,7 +31,6 @@
 #endif
 #if !defined(__SVR4) && !defined(__svr4__)
 # ifndef linux
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # endif
 #else

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#6 (text+ko) ====

@@ -54,7 +54,6 @@
 # else
 #  include <sys/dir.h>
 # endif
-# include <sys/mac.h>
 # include <sys/mbuf.h>
 #else
 # include <sys/filio.h>

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#5 (text+ko) ====

@@ -38,7 +38,6 @@
 #  include <sys/kernel.h>
 # endif
 # ifndef linux
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # endif
 #else

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#5 (text+ko) ====

@@ -64,7 +64,6 @@
 #  else
 #   include <sys/dir.h>
 #  endif
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # else
 #  include <sys/filio.h>

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#7 (text+ko) ====

@@ -43,7 +43,6 @@
 #endif
 #if !defined(__SVR4) && !defined(__svr4__)
 # ifndef linux
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # endif
 #else

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.c#6 (text+ko) ====

@@ -38,7 +38,6 @@
 #endif
 #if !defined(__SVR4) && !defined(__svr4__)
 # ifndef linux
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # endif
 #else

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#5 (text+ko) ====

@@ -48,7 +48,6 @@
 #endif
 #if !defined(__SVR4) && !defined(__svr4__)
 # ifndef linux
-#  include <sys/mac.h>
 #  include <sys/mbuf.h>
 # endif
 #else

==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 (text+ko) ====

@@ -28,9 +28,6 @@
 
 
 #include <sys/param.h>
-#if (__FreeBSD_version >= 500027)
-# include <sys/mac.h>
-#endif
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message