From owner-p4-projects@FreeBSD.ORG Fri Dec 19 12:49:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03EB21065678; Fri, 19 Dec 2008 12:49:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB0801065674 for ; Fri, 19 Dec 2008 12:49:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A89018FC1B for ; Fri, 19 Dec 2008 12:49:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJCn4Q9007966 for ; Fri, 19 Dec 2008 12:49:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJCn4Tq007964 for perforce@freebsd.org; Fri, 19 Dec 2008 12:49:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Dec 2008 12:49:04 GMT Message-Id: <200812191249.mBJCn4Tq007964@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 154998 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: Fri, 19 Dec 2008 12:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=154998 Change 154998 by rwatson@rwatson_cinnamon on 2008/12/19 12:48:20 Use stddef.h for NULL. Detect stdint.h and include it in compat/endian.h if present. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/endian.h#8 edit .. //depot/projects/trustedbsd/openbsm/configure#46 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#48 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/endian.h#8 (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#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#8 $ */ #ifndef _COMPAT_ENDIAN_H_ @@ -35,7 +35,9 @@ * Some systems will have the uint/int types defined here already, others * will need stdint.h. */ +#ifdef HAVE_STDINT_H #include +#endif /* * Some operating systems do not yet have the more recent endian APIs that ==== //depot/projects/trustedbsd/openbsm/configure#46 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#46 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for OpenBSM 1.1alpha4. # @@ -19852,7 +19852,8 @@ -for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h + +for ac_header in endian.h mach/mach.h machine/endian.h sys/endian.h stdint.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -22970,7 +22971,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include + #include extern int auditon(int, void *, int); ==== //depot/projects/trustedbsd/openbsm/configure.ac#48 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.1alpha4], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#47 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#48 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -35,7 +35,7 @@ # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h]) +AC_CHECK_HEADERS([endian.h mach/mach.h machine/endian.h sys/endian.h stdint.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -106,7 +106,7 @@ # depend on them or it will generate link-time or run-time errors. Test for # just one. AC_TRY_LINK([ - #include + #include extern int auditon(int, void *, int); ], [