From owner-p4-projects@FreeBSD.ORG Tue Feb 28 01:30:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2731916A423; Tue, 28 Feb 2006 01:30:52 +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 D814916A422 for ; Tue, 28 Feb 2006 01:30:51 +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 6F4E543D8F for ; Tue, 28 Feb 2006 01:30:48 +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 k1S1UmRS074699 for ; Tue, 28 Feb 2006 01:30:48 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 k1S1Um81074696 for perforce@freebsd.org; Tue, 28 Feb 2006 01:30:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 28 Feb 2006 01:30:48 GMT Message-Id: <200602280130.k1S1Um81074696@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 92504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Feb 2006 01:30:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92504 Change 92504 by rwatson@rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:29:46 Use configure results to decide which queue.h to use. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 (text+ko) ==== @@ -34,19 +34,14 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $ */ #ifndef _AUDIT_INTERNAL_H #define _AUDIT_INTERNAL_H -#ifdef __linux__ -#include -#ifndef __unused +#if defined(__linux__) && !defined(__unused) #define __unused -#endif /* !__unused */ -#else -#include #endif /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 (text+ko) ==== @@ -30,11 +30,22 @@ * 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#19 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 $ */ #include +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H +#include +#else +#include +#endif +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ + #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ * 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#32 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 $ */ #include @@ -51,9 +51,15 @@ #endif /* !HAVE_ENDIAN_H */ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include -#endif /* !HAVE_SYS_ENDIANG_H */ +#endif /* !HAVE_SYS_ENDIAN_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #else /* !HAVE_CONFIG_H */ #include +#include #endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 (text+ko) ==== @@ -27,11 +27,21 @@ * 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_mask.c#11 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 $ */ #include + +#ifdef HAVE_CONFIG_H +#include +#ifdef HAVE_FULL_QUEUE_H #include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ +#else /* !HAVE_CONFIG_H */ +#include +#endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 (text+ko) ==== @@ -26,18 +26,39 @@ * 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_notify.c#9 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 $ */ /* * Based on sample code from Marc Majka. */ -#include /* strerror() */ -#include /* errno */ +#include + +#ifdef HAVE_CONFIG_H + +#include + +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ + +#else /* !HAVE_CONFIG_H */ + +#include + +#endif /* !HAVE_CONFIG_H */ + +#include #include -#include /* uint32_t */ -#include /* syslog() */ -#include /* syslog() */ + +#include +#include +#include +#include +#include + #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 (text+ko) ==== @@ -30,7 +30,7 @@ * 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#37 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 $ */ #include @@ -51,8 +51,14 @@ #endif /* !HAVE_MACHINE_ENDIAN_H */ #include #endif /* !HAVE_SYS_ENDIANG_H */ +#ifdef HAVE_FULL_QUEUE_H +#include +#else /* !HAVE_FULL_QUEUE_H */ +#include +#endif /* !HAVE_FULL_QUEUE_H */ #else /* !HAVE_CONFIG_H */ #include +#include #endif /* !HAVE_CONFIG_H */ #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ * 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_user.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $ */ #include