PERFORCE change 84546 for review

[Todd Miller]

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

Change 84546 by millert at 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,
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message