From owner-p4-projects@FreeBSD.ORG  Thu Nov 20 19:21:23 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B3AA16A4D0; Thu, 20 Nov 2003 19:21:23 -0800 (PST)
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 D5DF816A4CE
	for <perforce@freebsd.org>; Thu, 20 Nov 2003 19:21:22 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2942A43FAF
	for <perforce@freebsd.org>; Thu, 20 Nov 2003 19:21:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAL3LMXJ033550
	for <perforce@freebsd.org>; Thu, 20 Nov 2003 19:21:22 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAL3LLf2033547
	for perforce@freebsd.org; Thu, 20 Nov 2003 19:21:21 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 20 Nov 2003 19:21:21 -0800 (PST)
Message-Id: <200311210321.hAL3LLf2033547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42870 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 21 Nov 2003 03:21:23 -0000

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

Change 42870 by rwatson@rwatson_powerbook on 2003/11/20 19:20:39

	Necessary include tweaks to allow checkpolicy to compile
	queue.c into userspace.  There appear to be a couple of
	divergences from the malloc/free compatibility mess in sebsd,
	so I've attempted to work around that.  Since this code
	presumably compiles for someone, there's probably some
	outstanding patches out there that need to be submitted in
	place of these.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/global.h#5 edit
.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/queue.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/global.h#5 (text+ko) ====

@@ -29,10 +29,9 @@
 #else /* _KERNEL */
 #include <stdlib.h>
 #include <errno.h>
-/*
 #define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a)
 #define sebsd_free(a,b) free(a)
-*/
+#define kmalloc(l, f) malloc(l)
 #define	mtx_lock(a)
 #define	mtx_unlock(a)
 #endif /* _KERNEL */

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/security/sebsd/ss/queue.c#5 (text+ko) ====

@@ -11,7 +11,10 @@
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
-#endif /* FreeBSD _KERNEL */
+#else /* FreeBSD _KERNEL */
+#define malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a)
+#define free(a,b) free(a)
+#endif
 
 #include <security/sebsd/linux-compat.h>
 #include <security/sebsd/ss/global.h>