From 0a2d84284c09ca49e2ae3001cee541e33e9e0957 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Thu, 19 Sep 2019 16:40:10 -0700
Subject: [PATCH] Update header include guard in zeek-config.h/bro-config.h

---
 CHANGES          | 4 ++++
 VERSION          | 2 +-
 aux/broker       | 2 +-
 bro-config.h.in  | 5 +----
 zeek-config.h.in | 5 +----
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index da889a0ef4..664b0df750 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+3.1.0-dev.125 | 2019-09-19 16:40:10 -0700
+
+  * Update header include guard in zeek-config.h/bro-config.h (Jon Siwek, Corelight)
+
 3.1.0-dev.124 | 2019-09-17 11:16:47 -0700
 
   * Add speculative service script. (Jan Grashoefer)
diff --git a/VERSION b/VERSION
index 058db7a26b..6da107bae0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0-dev.124
+3.1.0-dev.125
diff --git a/aux/broker b/aux/broker
index 73cb8185e5..b5aa189791 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 73cb8185e52402c143b749ac40fef2d46b220116
+Subproject commit b5aa18979125ff990053b24790bc89b852f632ba
diff --git a/bro-config.h.in b/bro-config.h.in
index 86c6cb95bd..879249be38 100644
--- a/bro-config.h.in
+++ b/bro-config.h.in
@@ -1,8 +1,5 @@
-#ifndef BRO_CONFIG_H
-#define BRO_CONFIG_H
+#pragma once
 
 #pragma message("Warning: bro-config.h is deprecated, use zeek-config.h instead")
 
 #include "zeek-config.h"
-
-#endif // BRO_CONFIG_H
diff --git a/zeek-config.h.in b/zeek-config.h.in
index ca7b1ff8a5..d21a7bdc7c 100644
--- a/zeek-config.h.in
+++ b/zeek-config.h.in
@@ -1,5 +1,4 @@
-#ifndef ZEEK_CONFIG_H
-#define ZEEK_CONFIG_H
+#pragma once
 
 /* Old libpcap versions (< 0.6.1) need defining pcap_freecode and
    pcap_compile_nopcap */
@@ -239,5 +238,3 @@ extern const char* BRO_VERSION_FUNCTION();
 #ifdef __cplusplus
 }
 #endif
-
-#endif // ZEEK_CONFIG_H