cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic softmagic.c
| From: | Antony Dovgal | Date: | Fri, 29 Aug 2008 10:12:29 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/fileinfo/libmagic softmagic.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52734@lists.php.net to get a copy of this message | ||
tony2001 Fri Aug 29 10:12:29 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic softmagic.c
Log:
fix ZTS build
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/softmagic.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/fileinfo/libmagic/softmagic.c
diff -u php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.2
php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.3
--- php-src/ext/fileinfo/libmagic/softmagic.c:1.1.2.2 Fri Aug 29 09:49:01 2008
+++ php-src/ext/fileinfo/libmagic/softmagic.c Fri Aug 29 10:12:29 2008
@@ -288,6 +288,7 @@
pcre *pce;
int re_options;
pcre_extra *re_extra;
+ TSRMLS_FETCH();
if (strchr(MAGIC_DESC, '%') == NULL) {
return 0;
@@ -1704,6 +1705,7 @@
zval *pattern;
int options = 0;
pcre_cache_entry *pce;
+ TSRMLS_FETCH();
MAKE_STD_ZVAL(pattern);
Z_STRVAL_P(pattern) = (char *)m->value.s;