From: Kyle Fuller <redacted>
Date: Tue, 23 Dec 2014 22:24:38 +0000 (+0000)
Subject: Depend on ZNC 1.5 for regex use
X-Git-Tag: 1.0.0~10
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0fa5d0e0436472b70e71dc02eb6d91ce539612ba;p=znc-palaver.git

Depend on ZNC 1.5 for regex use
---

diff --git a/palaver.cpp b/palaver.cpp
index a3b2301..7d81f4a 100644
--- a/palaver.cpp
+++ b/palaver.cpp
@@ -7,12 +7,6 @@
 
 #define REQUIRESSL
 
-#if defined(__has_include)
-#if __has_include(<regex>)
-#define HAS_REGEX
-#include <regex>
-#endif
-#endif
 
 #include <znc/Modules.h>
 #include <znc/User.h>
@@ -21,6 +15,14 @@
 #include <znc/Chan.h>
 #include <znc/FileUtils.h>
 
+#if defined VERSION_MAJOR && defined VERSION_MINOR && VERSION_MAJOR >= 1 && VERSION_MINOR >= 5
+#if defined(__has_include)
+#if __has_include(<regex>)
+#define HAS_REGEX
+#include <regex>
+#endif
+#endif
+#endif
 
 #ifndef PALAVER_VERSION
 	#define PALAVER_VERSION "unknown"