johannes Fri Jun 20 09:17:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_object.c
Log:
- Fix ZTS build (not required on HEAD, patch by Uwe Pries)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.24&r2=1.266.2.25&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.24
php-src/ext/phar/phar_object.c:1.266.2.25
--- php-src/ext/phar/phar_object.c:1.266.2.24 Fri Jun 20 05:42:58 2008
+++ php-src/ext/phar/phar_object.c Fri Jun 20 09:17:53 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.24 2008/06/20 05:42:58 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.25 2008/06/20 09:17:53 johannes Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -474,7 +474,7 @@
carry_on2:
if (SUCCESS != zend_hash_find(&(PHAR_GLOBALS->phar_fname_map),
arch, arch_len, (void **)&pphar)) {
if (PHAR_G(manifest_cached) && SUCCESS ==
zend_hash_find(&cached_phars, arch, arch_len, (void **)&pphar)) {
- if (SUCCESS == phar_copy_on_write(pphar)) {
+ if (SUCCESS == phar_copy_on_write(pphar
TSRMLS_CC)) {
goto carry_on;
}
}
@@ -505,7 +505,7 @@
} else if (SUCCESS == zend_hash_find(&(PHAR_GLOBALS->phar_fname_map),
fname, fname_len, (void **)&pphar)) {
goto carry_on;
} else if (PHAR_G(manifest_cached) && SUCCESS ==
zend_hash_find(&cached_phars, fname, fname_len, (void **)&pphar)) {
- if (SUCCESS == phar_copy_on_write(pphar)) {
+ if (SUCCESS == phar_copy_on_write(pphar TSRMLS_CC)) {
goto carry_on;
}
goto carry_on;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
