From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 19:03:27 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DE3C16A422 for ; Mon, 27 Feb 2006 19:03:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 18ABC43D46 for ; Mon, 27 Feb 2006 19:03:27 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 6C2B346B85 for ; Mon, 27 Feb 2006 14:03:08 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id C59BA55499; Mon, 27 Feb 2006 19:03:25 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AF04916A424; Mon, 27 Feb 2006 19:03:25 +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 58F8E16A420 for ; Mon, 27 Feb 2006 19:03:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EE8643D4C for ; Mon, 27 Feb 2006 19:03:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1RJ3PV6034115 for ; Mon, 27 Feb 2006 19:03:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1RJ3OJ3034112 for perforce@freebsd.org; Mon, 27 Feb 2006 19:03:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 19:03:24 GMT Message-Id: <200602271903.k1RJ3OJ3034112@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 92477 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 19:03:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=92477 Change 92477 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/27 19:02:36 Some tweakage of include file use. This needs to be more autoconf'd as we aren't currently doing feature tests for endian.h vs machine/endian.h use. We do do this for sys/endian.h though. Likewise, we need proper feature tests to decide whether to use the native queue.h or the compat/queue.h in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 edit .. //depot/projects/trustedbsd/openbsm/compat/endian.h#6 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 (text+ko) ==== @@ -34,13 +34,17 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H +#ifdef __linux__ +#include +#else #include +#endif /* * audit_internal.h contains private interfaces that are shared by user space ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * Derived from FreeBSD src/sys/sys/endian.h:1.6. - * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#6 $ */ #ifndef _COMPAT_ENDIAN_H_ @@ -34,7 +34,11 @@ /* * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included. */ +#ifdef __linux__ +#include +#else #include +#endif /* * Some systems will have the uint/int types defined here already, others ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 (text+ko) ==== @@ -30,11 +30,10 @@ * 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_audit.c#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 $ */ #include -#include #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 (text+ko) ==== @@ -31,15 +31,15 @@ * 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_io.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 $ */ #include -#ifdef __APPLE__ +#ifdef HAVE_SYS_ENDIAN_H +#include +#else #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 (text+ko) ==== @@ -30,15 +30,15 @@ * 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_token.c#34 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 $ */ #include -#ifdef __APPLE__ +#ifdef HAVE_SYS_ENDIAN_H +#include +#else #include -#else /* !__APPLE__ */ -#include -#endif /* __APPLE__*/ +#endif #include #include #include