From owner-p4-projects@FreeBSD.ORG  Fri Sep 30 13:10:54 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6781016A421; Fri, 30 Sep 2005 13:10:54 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 1CE7B16A41F
	for <perforce@freebsd.org>; Fri, 30 Sep 2005 13:10:54 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E13F543D49
	for <perforce@freebsd.org>; Fri, 30 Sep 2005 13:10:53 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8UDArH5049739
	for <perforce@freebsd.org>; Fri, 30 Sep 2005 13:10:53 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8UDArhN049733
	for perforce@freebsd.org; Fri, 30 Sep 2005 13:10:53 GMT
	(envelope-from millert@freebsd.org)
Date: Fri, 30 Sep 2005 13:10:53 GMT
Message-Id: <200509301310.j8UDArhN049733@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 84546 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2005 13:10:55 -0000

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

Change 84546 by millert@millert_g4tower on 2005/09/30 13:10:11

	#ifdef MAC not #if MAC

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#6 edit
.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#7 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.c#6 (text+ko) ====

@@ -1011,7 +1011,7 @@
 		return &port->ip_label;
 }
 
-#if MACH_ASSERT || MAC
+#if MACH_ASSERT || defined(MAC)
 /*
  *	Check whether the object is a port if so, free it.  But
  *	keep track of that fact.

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_object.h#7 (text+ko) ====

@@ -146,7 +146,7 @@
 #define	io_alloc(otype)		\
 		((ipc_object_t) zalloc(ipc_object_zones[(otype)]))
 
-#if MACH_ASSERT || MAC
+#if MACH_ASSERT || defined(MAC)
 /*
  *	Call the routine for io_free so that checking can be performed.
  */
@@ -154,10 +154,10 @@
 			unsigned int	otype,
 			ipc_object_t	object);
 
-#else   /* MACH_ASSERT */
+#else   /* MACH_ASSERT || MAC */
 #define io_free(otype, io)  \
         zfree(ipc_object_zones[(otype)], (vm_offset_t) (io))
-#endif /* MACH_ASSERT */
+#endif /* MACH_ASSERT || MAC */
 
 /*
  * Here we depend on the ipc_object being first within the ipc_common_data,