diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/pcre/php_pcre.h | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/pcre/php_pcre.h')
| -rw-r--r-- | ext/pcre/php_pcre.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.h b/ext/pcre/php_pcre.h index ff1b2267e8..c23225138d 100644 --- a/ext/pcre/php_pcre.h +++ b/ext/pcre/php_pcre.h @@ -15,7 +15,7 @@ | Author: Andrei Zmievski <andrei@php.net> | +----------------------------------------------------------------------+ */ - + /* $Id$ */ #ifndef PHP_PCRE_H @@ -59,7 +59,7 @@ 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, zend_long flags, zend_long start_offset); -PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, char *subject, int subject_len, zval *return_value, +PHPAPI zend_string *php_pcre_replace_impl(pcre_cache_entry *pce, 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, |