You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/08/06 04:35:25 UTC
[2/2] trafficserver git commit: TS-3824 Fix #include of pcre for a
couple of plugins
TS-3824 Fix #include of pcre for a couple of plugins
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0c28aa66
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0c28aa66
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0c28aa66
Branch: refs/heads/master
Commit: 0c28aa665ddf633171884a9ca0a90e89ade71ce5
Parents: 9e8800c
Author: Leif Hedstrom <zw...@apache.org>
Authored: Wed Aug 5 20:18:09 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Aug 5 20:27:53 2015 -0600
----------------------------------------------------------------------
plugins/experimental/geoip_acl/acl.h | 5 +++++
plugins/header_rewrite/regex_helper.h | 6 ++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c28aa66/plugins/experimental/geoip_acl/acl.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/geoip_acl/acl.h b/plugins/experimental/geoip_acl/acl.h
index 81c35cf..e9be954 100644
--- a/plugins/experimental/geoip_acl/acl.h
+++ b/plugins/experimental/geoip_acl/acl.h
@@ -21,7 +21,12 @@
#include <ts/ts.h>
#include <ts/remap.h>
+
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
#include <pcre.h>
+#endif
#include <string>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c28aa66/plugins/header_rewrite/regex_helper.h
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/regex_helper.h b/plugins/header_rewrite/regex_helper.h
index 45b061c..6be153a 100644
--- a/plugins/header_rewrite/regex_helper.h
+++ b/plugins/header_rewrite/regex_helper.h
@@ -18,7 +18,13 @@
#ifndef REGEX_HELPER_H
#define REGEX_HELPER_H
+#include "ts/ink_defs.h"
+
+#ifdef HAVE_PCRE_PCRE_H
+#include <pcre/pcre.h>
+#else
#include <pcre.h>
+#endif
#include <string>