PERFORCE change 219838 for review
Robert Watson
rwatson at FreeBSD.org
Fri Nov 23 23:38:05 UTC 2012
http://p4web.freebsd.org/@@219838?ac=10
Change 219838 by rwatson at 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>
More information about the p4-projects
mailing list