diff options
author | Anatol Belski <ab@php.net> | 2014-08-17 13:31:39 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-08-17 13:31:39 +0200 |
commit | 90d6f60bc17bb4fea69feeab506eb02bfeec20fd (patch) | |
tree | f759964466d23656e796bd79964a424464655ee2 /ext/pcre/php_pcre.c | |
parent | 977cf1dc11da0363692374951088696855ae293d (diff) | |
download | php-git-90d6f60bc17bb4fea69feeab506eb02bfeec20fd.tar.gz |
mostly fixes to spl, but also some other
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r-- | ext/pcre/php_pcre.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 3ff51978c9..3990580640 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1437,10 +1437,10 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, int is_callable_repl php_int_t limit = -1; zend_string *result; zend_string *string_key; - ulong num_key; + php_uint_t num_key; zend_string *callback_name; int replace_count=0, old_replace_count; - + #ifndef FAST_ZPP /* Get function parameters and do error-checking. */ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zzz|iz/", ®ex, &replace, &subject, &limit, &zcount) == FAILURE) { @@ -1898,7 +1898,7 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return int size_offsets; /* Size of the offsets array */ int count = 0; /* Count of matched subpatterns */ zend_string *string_key; - ulong num_key; + php_uint_t num_key; zend_bool invert; /* Whether to return non-matching entries */ ALLOCA_FLAG(use_heap); |