From owner-p4-projects@FreeBSD.ORG  Fri Nov 23 23:38:05 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 38E36D0C; Fri, 23 Nov 2012 23:38:05 +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 E9633CBE
 for <perforce@freebsd.org>; Fri, 23 Nov 2012 23:38:04 +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 A6AD58FC13
 for <perforce@freebsd.org>; Fri, 23 Nov 2012 23:38:04 +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 qANNc4l0017405
 for <perforce@freebsd.org>; Fri, 23 Nov 2012 23:38:04 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 qANNc43d017402
 for perforce@freebsd.org; Fri, 23 Nov 2012 23:38:04 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 23 Nov 2012 23:38:04 GMT
Message-Id: <201211232338.qANNc43d017402@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 <rwatson@FreeBSD.org>
Subject: PERFORCE change 219838 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Nov 2012 23:38:05 -0000

http://p4web.freebsd.org/@@219838?ac=10

Change 219838 by rwatson@rwatson_cinnamon on 2012/11/23 23:38:01

	Merge further #include "" vs #include <> to FreeBSD -CURRENT merge
	branch for OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#3 integrate
.. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sigtimedwait.h#2 integrate
.. //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#3 integrate

Differences ...

==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#3 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#2 $
+ * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/parse.y#3 $
  */
 
 #include <config/config.h>
@@ -48,9 +48,8 @@
 #include <compat/strlcpy.h>
 #endif
 
-#include <pjdlog.h>
-
 #include "auditdistd.h"
+#include "pjdlog.h"
 
 extern int depth;
 extern int lineno;

==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sigtimedwait.h#2 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sigtimedwait.h#1 $
+ * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/sigtimedwait.h#2 $
  */
 
 #ifndef	_SIGTIMEDWAIT_H_
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <pjdlog.h>
+#include "pjdlog.h"
 
 static int
 sigtimedwait(const sigset_t *set, siginfo_t *info,

==== //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#3 (text+ko) ====

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#2 $
+ * $P4: //depot/projects/trustedbsd/audit_merge/src/contrib/openbsm/bin/auditdistd/synch.h#3 $
  */
 
 #ifndef	_SYNCH_H_
@@ -40,7 +40,7 @@
 #include <stdbool.h>
 #include <time.h>
 
-#include <pjdlog.h>
+#include "pjdlog.h"
 
 #ifndef	PJDLOG_ASSERT
 #include <assert.h>