From owner-trustedbsd-cvs@FreeBSD.ORG Sat Jun 17 19:24:17 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 5AE6916A51E for ; Sat, 17 Jun 2006 19:24:17 +0000 (UTC) (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 C8FF643D4C for ; Sat, 17 Jun 2006 19:24:09 +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 2222546C05 for ; Sat, 17 Jun 2006 15:24:09 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 544D35BAB9; Sat, 17 Jun 2006 19:24:06 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBBC16A47A; Sat, 17 Jun 2006 19:24:06 +0000 (UTC) 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 1333E16A47B for ; Sat, 17 Jun 2006 19:24:06 +0000 (UTC) (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 938FA43D6B for ; Sat, 17 Jun 2006 19:24:04 +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.6/8.13.6) with ESMTP id k5HJO4tr095257 for ; Sat, 17 Jun 2006 19:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5HJO47P095254 for perforce@freebsd.org; Sat, 17 Jun 2006 19:24:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 17 Jun 2006 19:24:04 GMT Message-Id: <200606171924.k5HJO47P095254@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 99450 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: Sat, 17 Jun 2006 19:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=99450 Change 99450 by rwatson@rwatson_sesame on 2006/06/17 19:23:58 Test for LIST_FIRST and TAILQ_FOREACH_SAFE in queue.h; FreeBSD 4.x offers the former but not latter, so we must use the compat queue.h on FreeBSD 4.x. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#21 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#21 (xtext) ==== @@ -22936,8 +22936,8 @@ # sys/queue.h exists on most systems, but its capabilities vary a great deal. -# test for LIST_FIRST, which appears to not exist in all of them, and is -# necessary for OpenBSM. +# test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in +# all of them, and are necessary for OpenBSM. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22951,13 +22951,13 @@ main () { - struct foo { - LIST_ENTRY(foo) foo_entries; - }; - LIST_HEAD(, foo) foo_list; - struct foo *foo; - foo = LIST_FIRST(&foo_list); + #ifndef LIST_FIRST + #error LIST_FIRST missing + #endif + #ifndef TAILQ_FOREACH_SAFE + #error TAILQ_FOREACH_SAFE + #endif ; return 0; ==== //depot/projects/trustedbsd/openbsm/configure.ac#23 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a6], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#22 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -59,18 +59,18 @@ AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. -# test for LIST_FIRST, which appears to not exist in all of them, and is -# necessary for OpenBSM. +# test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in +# all of them, and are necessary for OpenBSM. AC_TRY_LINK([ #include ], [ - struct foo { - LIST_ENTRY(foo) foo_entries; - }; - LIST_HEAD(, foo) foo_list; - struct foo *foo; - foo = LIST_FIRST(&foo_list); + #ifndef LIST_FIRST + #error LIST_FIRST missing + #endif + #ifndef TAILQ_FOREACH_SAFE + #error TAILQ_FOREACH_SAFE + #endif ], [ AC_DEFINE(HAVE_FULL_QUEUE_H,, Define if queue.h includes LIST_FIRST) ])