From owner-p4-projects@FreeBSD.ORG Wed Apr 28 10:13:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FC5E16A4D0; Wed, 28 Apr 2004 10:13:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 283C916A4CE for ; Wed, 28 Apr 2004 10:13:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EED243D1D for ; Wed, 28 Apr 2004 10:13:05 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3SHD4Ge091888 for ; Wed, 28 Apr 2004 10:13:04 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3SHD4GO091885 for perforce@freebsd.org; Wed, 28 Apr 2004 10:13:04 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 28 Apr 2004 10:13:04 -0700 (PDT) Message-Id: <200404281713.i3SHD4GO091885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 17:13:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=51854 Change 51854 by areisse@areisse_ibook on 2004/04/28 10:12:33 remove sys/_label.h from bsd side; use mach/_label.h instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/bpfdesc.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/if_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/netinet/ip_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/_label.h#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac.h#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mbuf.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mount.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/proc.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/socketvar.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/ucred.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/vnode.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/osfmk/mach/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/bpfdesc.h#3 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -#include +#include /* * Descriptor associated with each open bpf file. ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/if_var.h#3 (text+ko) ==== @@ -117,7 +117,7 @@ #define IFNAMSIZ 16 -#include /* struct label */ +#include /* struct label */ #include /* get TAILQ macros */ #ifdef __APPLE_API_UNSTABLE ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/netinet/ip_var.h#3 (text+ko) ==== @@ -62,7 +62,7 @@ #include #ifdef KERNEL -#include +#include #endif #ifdef __APPLE_API_PRIVATE ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/Makefile#3 (text+ko) ==== @@ -20,7 +20,7 @@ EXPINC_SUBDIRS_I386 = \ DATAFILES = \ - _label.h condvar.h appleapiopts.h acct.h aio.h attr.h \ + condvar.h appleapiopts.h acct.h aio.h attr.h \ audit.h bsm_kevents.h bsm_token.h bsm_uevents.h \ buf.h callout.h cdefs.h clist.h conf.h \ dir.h dirent.h disk.h disklabel.h disktab.h dkstat.h dmap.h domain.h \ ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac.h#2 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef _SYS_MAC_H #define _SYS_MAC_H -#include +#include #ifndef _POSIX_MAC #define _POSIX_MAC ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac_policy.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mbuf.h#3 (text+ko) ==== @@ -77,7 +77,7 @@ #include #include -#include +#include /* * Mbufs are of a single size, MSIZE (machine/param.h), which ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mount.h#3 (text+ko) ==== @@ -69,7 +69,7 @@ #include #include #include /* XXX for AF_MAX */ -#include +#include typedef struct fsid { int32_t val[2]; } fsid_t; /* file system id type */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/proc.h#3 (text+ko) ==== @@ -70,7 +70,7 @@ #include #include /* For struct selinfo. */ #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/socketvar.h#3 (text+ko) ==== @@ -64,7 +64,7 @@ #define _SYS_SOCKETVAR_H_ #include -#include /* for struct label */ +#include /* for struct label */ #include /* for TAILQ macros */ #include /* for struct selinfo */ #include ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/ucred.h#3 (text+ko) ==== @@ -63,7 +63,7 @@ #include #include -#include +#include #ifdef __APPLE_API_UNSTABLE /* ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/vnode.h#3 (text+ko) ==== @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/osfmk/mach/Makefile#3 (text+ko) ==== @@ -91,6 +91,7 @@ MIGINCLUDES = ${MIG_UUHDRS} ${MIG_USHDRS} DATAFILES = \ + _label.h \ boolean.h \ boot_info.h \ bootstrap.h \