From 4cbca117a3f2ef2d6695504970378ec4c483d19f Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Mon, 5 Feb 2018 17:27:45 +0100
Subject: Compatibility layer for pcre2

This should close #129---
 src/php_snuffleupagus.h | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/php_snuffleupagus.h')

diff --git a/src/php_snuffleupagus.h b/src/php_snuffleupagus.h
index 95f271d..52bcc93 100644
--- a/src/php_snuffleupagus.h
+++ b/src/php_snuffleupagus.h
@@ -24,6 +24,7 @@
 #include "zend_string.h"
 #include "zend_extensions.h"
 
+#include "sp_pcre_compat.h"
 #include "sp_list.h"
 #include "sp_tree.h"
 #include "sp_var_parser.h"
@@ -71,18 +72,6 @@ ZEND_END_MODULE_GLOBALS(snuffleupagus)
 ZEND_TSRMLS_CACHE_EXTERN()
 #endif
 
-#if HAVE_BUNDLED_PCRE
- #include "ext/pcre/pcrelib/pcre.h"
- #undef pcre_exec
- #undef pcre_compile
- #define sp_pcre_exec pcre_exec
- #define sp_pcre_compile pcre_compile
-#else
- #include "pcre.h"
- #define sp_pcre_exec pcre_exec
- #define sp_pcre_compile pcre_compile
-#endif
-
 PHP_FUNCTION(check_disabled_function);
 PHP_FUNCTION(eval_blacklist_callback);
 
-- 
cgit v1.3