tony2001 Fri Aug 29 10:08:31 2008 UTC
Modified files:
/php-src/ext/fileinfo/libmagic softmagic.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.3
php-src/ext/fileinfo/libmagic/softmagic.c:1.4
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.3 Fri Aug 29 09:50:57 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c Fri Aug 29 10:08:30 2008
@@ -1718,7 +1718,7 @@
convert_libmagic_pattern(pattern, options);
- if ((pce = pcre_get_compiled_regex_cache(Z_STRVAL_P(pattern),
Z_STRLEN_P(pattern) TSRMLS_CC)) == NULL) {
+ if ((pce = pcre_get_compiled_regex_cache(IS_STRING,
Z_STRVAL_P(pattern), Z_STRLEN_P(pattern) TSRMLS_CC)) == NULL) {
return -1;
} else {
/* pce now contains the compiled regex */
@@ -1733,7 +1733,7 @@
haystack = estrndup(ms->search.s, ms->search.s_len);
/* match v = 0, no match v = 1 */
- php_pcre_match_impl(pce, haystack, ms->search.s_len,
retval, subpats, 1, 1, PREG_OFFSET_CAPTURE, 0 TSRMLS_CC);
+ php_pcre_match_impl(pce, IS_STRING, haystack,
ms->search.s_len, retval, subpats, 1, 1, PREG_OFFSET_CAPTURE, 0 TSRMLS_CC);
/* Free haystack */
efree(haystack);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
