From owner-p4-projects@FreeBSD.ORG Fri Mar 3 21:51:51 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 6100116A423; Fri, 3 Mar 2006 21:51:51 +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 1DD6516A420 for ; Fri, 3 Mar 2006 21:51: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 CCF3043D46 for ; Fri, 3 Mar 2006 21:51:50 +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 k23LpodG077491 for ; Fri, 3 Mar 2006 21:51:50 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 k23LpnOm077486 for perforce@freebsd.org; Fri, 3 Mar 2006 21:51:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 Mar 2006 21:51:49 GMT Message-Id: <200603032151.k23LpnOm077486@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 92694 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, 03 Mar 2006 21:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92694 Change 92694 by rwatson@rwatson_zoo on 2006/03/03 21:51:17 Assume that config.h will be present; don't attempt to provide FreeBSD default includes when HAVE_CONFIG_H isn't defined. While we can do the includes without config.h, the conditionally compiled system call code works best with a config.h, so we'll want to provide a configured config.h in the FreeBSD vendor import, similar to the approach taken in OpenSSH. This mildly de-obfuscates the includes here also. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 (text+ko) ==== @@ -30,21 +30,17 @@ * 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#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#22 $ */ #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#34 (text+ko) ==== @@ -31,12 +31,11 @@ * 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#33 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#34 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -57,10 +56,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 (text+ko) ==== @@ -27,21 +27,17 @@ * 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#12 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#13 $ */ #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#11 (text+ko) ==== @@ -26,7 +26,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_notify.c#10 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#11 $ */ /* @@ -34,22 +34,13 @@ */ #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 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 (text+ko) ==== @@ -30,12 +30,11 @@ * 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#41 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#42 $ */ #include -#ifdef HAVE_CONFIG_H #include #ifdef HAVE_SYS_ENDIAN_H #include @@ -56,10 +55,6 @@ #else /* !HAVE_FULL_QUEUE_H */ #include #endif /* !HAVE_FULL_QUEUE_H */ -#else /* !HAVE_CONFIG_H */ -#include -#include -#endif /* !HAVE_CONFIG_H */ #include #include