diff options
Diffstat (limited to 'ext/pcre/php_pcre.h')
| -rw-r--r-- | ext/pcre/php_pcre.h | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h index 59b759e4a2..5ce3cedcda 100644 --- a/ext/pcre/php_pcre.h +++ b/ext/pcre/php_pcre.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2016 The PHP Group | +----------------------------------------------------------------------+ @@ -15,7 +15,7 @@ | Author: Andrei Zmievski <andrei@php.net> | +----------------------------------------------------------------------+ */ - + /* $Id$ */ #ifndef PHP_PCRE_H @@ -33,51 +33,56 @@ #include <locale.h> #endif -PHPAPI char *php_pcre_replace(char *regex, int regex_len, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int *result_len, int limit, int *replace_count TSRMLS_DC); -PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *options TSRMLS_DC); -PHPAPI pcre* pcre_get_compiled_regex_ex(char *regex, pcre_extra **extra, int *preg_options, int *coptions TSRMLS_DC); +PHPAPI zend_string *php_pcre_replace(zend_string *regex, zend_string *subject_str, char *subject, int subject_len, zval *replace_val, int is_callable_replace, int limit, int *replace_count); +PHPAPI pcre* pcre_get_compiled_regex(zend_string *regex, pcre_extra **extra, int *options); +PHPAPI pcre* pcre_get_compiled_regex_ex(zend_string *regex, pcre_extra **extra, int *preg_options, int *coptions); extern zend_module_entry pcre_module_entry; #define pcre_module_ptr &pcre_module_entry +#include "php_version.h" +#define PHP_PCRE_VERSION PHP_VERSION + typedef struct { pcre *re; pcre_extra *extra; int preg_options; + int capture_count; + int name_count; #if HAVE_SETLOCALE - char *locale; + zend_string *locale; unsigned const char *tables; #endif int compile_options; int refcount; } pcre_cache_entry; -PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(char *regex, int regex_len TSRMLS_DC); +PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex); PHPAPI void php_pcre_match_impl( pcre_cache_entry *pce, char *subject, int subject_len, zval *return_value, - zval *subpats, int global, int use_flags, long flags, long start_offset TSRMLS_DC); + zval *subpats, int global, int use_flags, zend_long flags, zend_long start_offset); -PHPAPI char *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int subject_len, zval *return_value, - int is_callable_replace, int *result_len, int limit, int *replace_count TSRMLS_DC); +PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, zend_string *subject_str, char *subject, int subject_len, zval *return_value, + int is_callable_replace, int limit, int *replace_count); PHPAPI void php_pcre_split_impl( pcre_cache_entry *pce, char *subject, int subject_len, zval *return_value, - long limit_val, long flags TSRMLS_DC); + zend_long limit_val, zend_long flags); PHPAPI void php_pcre_grep_impl( pcre_cache_entry *pce, zval *input, zval *return_value, - long flags TSRMLS_DC); + zend_long flags); ZEND_BEGIN_MODULE_GLOBALS(pcre) HashTable pcre_cache; - long backtrack_limit; - long recursion_limit; + zend_long backtrack_limit; + zend_long recursion_limit; +#ifdef HAVE_PCRE_JIT_SUPPORT + zend_bool jit; +#endif int error_code; ZEND_END_MODULE_GLOBALS(pcre) -#ifdef ZTS -# define PCRE_G(v) TSRMG(pcre_globals_id, zend_pcre_globals *, v) -#else -# define PCRE_G(v) (pcre_globals.v) -#endif +PHPAPI ZEND_EXTERN_MODULE_GLOBALS(pcre) +#define PCRE_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(pcre, v) #else |