From owner-p4-projects@FreeBSD.ORG Fri Nov 23 22:55:19 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B53A2D3C; Fri, 23 Nov 2012 22:55:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 74E2ED3A for ; Fri, 23 Nov 2012 22:55:18 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 591658FC12 for ; Fri, 23 Nov 2012 22:55:18 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qANMtIox015396 for ; Fri, 23 Nov 2012 22:55:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qANMtILm015393 for perforce@freebsd.org; Fri, 23 Nov 2012 22:55:18 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 23 Nov 2012 22:55:18 GMT Message-Id: <201211232255.qANMtILm015393@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 219832 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2012 22:55:19 -0000 http://p4web.freebsd.org/@@219832?ac=10 Change 219832 by rwatson@rwatson_cinnamon on 2012/11/23 22:54:43 Be more consistent with the remainder of OpenBSM and include config/config.h rather than config.h. Don't include config.h from synch.h, which is included only from .c files that already include config.h. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#4 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 edit .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/auditdistd.c#2 $ */ -#include "config.h" +#include #include #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#4 (text+ko) ==== @@ -27,10 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/parse.y#4 $ */ -#include "config.h" +#include #include #include ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 (text+ko) ==== @@ -27,12 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tcp.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* MAXHOSTNAMELEN */ #include ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 (text+ko) ==== @@ -26,12 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_tls.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include /* MAXHOSTNAMELEN */ #include ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 (text+ko) ==== @@ -26,14 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/proto_uds.c#2 $ */ /* UDS - UNIX Domain Socket */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #include ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/receiver.c#2 $ */ -#include "config.h" +#include #include #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#2 (text+ko) ==== @@ -26,12 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sandbox.c#2 $ */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include #include #ifdef HAVE_JAIL ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#2 $ */ -#include "config.h" +#include #include #if defined(HAVE_SYS_ENDIAN_H) && defined(HAVE_BSWAP) ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#2 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/subr.c#2 $ */ -#include "config.h" +#include #ifdef HAVE_KQUEUE #include ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#2 (text+ko) ==== @@ -26,16 +26,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/synch.h#2 $ */ #ifndef _SYNCH_H_ #define _SYNCH_H_ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include #include #ifdef HAVE_PTHREAD_NP_H ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 (text+ko) ==== @@ -27,10 +27,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/token.l#2 $ */ -#include "config.h" +#include #include #include ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#2 (text+ko) ==== @@ -26,10 +26,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/trail.c#2 $ */ -#include "config.h" +#include #include #include