Avoid Regex.h/regex.h case clash on Macs.

diff --git a/src/ConfFile.h b/src/ConfFile.h
index 32b98df..bd36a66 100644 (file)
--- a/src/ConfFile.h
+++ b/src/ConfFile.h
@@ -24,7 +24,7 @@
 #include <cstring>
 #include <cstdio>
 
-#include "Regex.h"
+#include "Regex_.h"
 #include "Address.h"
 
 class BlockMethod;

diff --git a/src/Makefile.am b/src/Makefile.am
index 326c88b..f1811b3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ noinst_LIBRARIES=libutils.a
 sbin_PROGRAMS=blockad
 man_MANS=blockad.8
 libutils_a_SOURCES=Address.cc ConfFile.cc Regex.cc StdioFile.cc                \
-Watcher.cc Address.h ConfFile.h Regex.h StdioFile.h Watcher.h log.h    \
+Watcher.cc Address.h ConfFile.h Regex_.h StdioFile.h Watcher.h log.h   \
 log.cc IOError.cc IOError.h nonblock.cc utils.h execute.cc             \
 BlockMethod.h BlockMethod.cc
 blockad_SOURCES=blockad.cc iptables.cc hosts.deny.cc

diff --git a/src/Regex.cc b/src/Regex.cc
index b7ff3b7..977ead2 100644 (file)
--- a/src/Regex.cc
+++ b/src/Regex.cc
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 #include <config.h>
-#include "Regex.h"
+#include "Regex_.h"
 
 // Regex ----------------------------------------------------------------------
 

diff --git a/src/Regex.h b/src/Regex_.h
similarity index 100%
rename from src/Regex.h
rename to src/Regex_.h

diff --git a/src/blockad.cc b/src/blockad.cc
index fbe5886..74b5a0e 100644 (file)
--- a/src/blockad.cc
+++ b/src/blockad.cc
@@ -18,7 +18,7 @@
 #include "Watcher.h"
 #include "ConfFile.h"
 #include "Address.h"
-#include "Regex.h"
+#include "Regex_.h"
 #include "BlockMethod.h"
 #include "log.h"
 #include "utils.h"

diff --git a/tests/regtest.cc b/tests/regtest.cc
index 97647c4..9430b9a 100644 (file)
--- a/tests/regtest.cc
+++ b/tests/regtest.cc
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 #include <config.h>
-#include "Regex.h"
+#include "Regex_.h"
 #include <cassert>
 
 int main() {