PERFORCE change 51854 for review

[Andrew Reisse]

http://perforce.freebsd.org/chv.cgi?CH=51854

Change 51854 by areisse at 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 <sys/select.h>
-#include <sys/_label.h>
+#include <mach/_label.h>
 
 /*
  * 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 <sys/_label.h>		/* struct label */
+#include <mach/_label.h>		/* struct label */
 #include <sys/queue.h>		/* 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 <sys/appleapiopts.h>
 
 #ifdef KERNEL
-#include <sys/_label.h>
+#include <mach/_label.h>
 #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 <sys/_label.h>
+#include <mach/_label.h>
 
 #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 <sys/appleapiopts.h>
 #include <sys/lock.h>
-#include <sys/_label.h>
+#include <mach/_label.h>
 
 /*
  * 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 <sys/lock.h>
 #include <net/radix.h>
 #include <sys/socket.h>		/* XXX for AF_MAX */
-#include <sys/_label.h>
+#include <mach/_label.h>
 
 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 <sys/cdefs.h>
 #include <sys/select.h>			/* For struct selinfo. */
 #include <sys/queue.h>
-#include <sys/_label.h>
+#include <mach/_label.h>
 #include <sys/lock.h>
 #include <sys/param.h>
 #include <sys/event.h>

==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/socketvar.h#3 (text+ko) ====

@@ -64,7 +64,7 @@
 #define _SYS_SOCKETVAR_H_
 
 #include <sys/appleapiopts.h>
-#include <sys/_label.h>			/* for struct label */
+#include <mach/_label.h>			/* for struct label */
 #include <sys/queue.h>			/* for TAILQ macros */
 #include <sys/select.h>			/* for struct selinfo */
 #include <net/kext_net.h>

==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/ucred.h#3 (text+ko) ====

@@ -63,7 +63,7 @@
 
 #include <sys/appleapiopts.h>
 #include <sys/param.h>
-#include <sys/_label.h>
+#include <mach/_label.h>
 
 #ifdef __APPLE_API_UNSTABLE
 /*

==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/vnode.h#3 (text+ko) ====

@@ -64,7 +64,7 @@
 #include <sys/appleapiopts.h>
 #include <sys/cdefs.h>
 #include <sys/queue.h>
-#include <sys/_label.h>
+#include <mach/_label.h>
 #include <sys/lock.h>
 
 #include <sys/time.h>

==== //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 \
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message