PERFORCE change 91360 for review

[Robert Watson]

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

Change 91360 by rwatson at rwatson_peppercorn on 2006/02/08 02:16:41

	Darwin's sys/sysctl.h causes a nested include of the host
	sys/audit.h, which contains duplicate type definitions to
	bsm/libbsm.h.  We need our own definitions, so for now, use a
	#define to tell the compiler we already have all the necessary bits
	from sys/audit.h on Apple platforms.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 (text+ko) ====

@@ -26,9 +26,13 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#15 $
  */
 
+#ifdef __APPLE__
+#define	_SYS_AUDIT_H		/* Prevent include of sys/audit.h. */
+#endf
+
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message