dmitry Tue Sep 19 07:39:07 2006 UTC
Modified files:
/php-src/ext/spl spl_iterators.c
Log:
Fixed PCRE related compilation errors
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.149&r2=1.150&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.149
php-src/ext/spl/spl_iterators.c:1.150
--- php-src/ext/spl/spl_iterators.c:1.149 Tue Aug 29 21:49:32 2006
+++ php-src/ext/spl/spl_iterators.c Tue Sep 19 07:39:07 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_iterators.c,v 1.149 2006/08/29 21:49:32 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.150 2006/09/19 07:39:07 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -1020,7 +1020,7 @@
}
intern->u.regex.mode = mode;
intern->u.regex.regex = estrndup(regex, regex_len);
- intern->u.regex.pce =
pcre_get_compiled_regex_cache(regex, regex_len, 0 TSRMLS_CC);
+ intern->u.regex.pce =
pcre_get_compiled_regex_cache(regex, regex_len TSRMLS_CC);
intern->u.regex.pce->refcount++;
break;;
}
@@ -1444,7 +1444,7 @@
zval_ptr_dtor(&intern->current.data);
ALLOC_INIT_ZVAL(intern->current.data);
php_pcre_match_impl(intern->u.regex.pce, subject, subject_len,
&zcount,
- intern->current.data, intern->u.regex.mode ==
REGIT_MODE_ALL_MATCHES, intern->u.regex.use_flags, intern->u.regex.preg_flags,
0, 0 TSRMLS_CC);
+ intern->current.data, intern->u.regex.mode ==
REGIT_MODE_ALL_MATCHES, intern->u.regex.use_flags, intern->u.regex.preg_flags,
0 TSRMLS_CC);
count =
zend_hash_num_elements(Z_ARRVAL_P(intern->current.data));
RETVAL_BOOL(count > 0);
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
