[PHP-CVS] cvs: php-src /ext/phar phar.c tar.c zip.c

[Antony Dovgal]

tony2001                Sun Oct 12 21:09:10 2008 UTC

  Modified files:              
    /php-src/ext/phar   phar.c tar.c zip.c 
  Log:
  fix ZTS build
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.389&r2=1.390&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.389 php-src/ext/phar/phar.c:1.390
--- php-src/ext/phar/phar.c:1.389       Sun Oct 12 19:40:29 2008
+++ php-src/ext/phar/phar.c     Sun Oct 12 21:09:10 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.389 2008/10/12 19:40:29 cellog Exp $ */
+/* $Id: phar.c,v 1.390 2008/10/12 21:09:10 tony2001 Exp $ */
 
 #define PHAR_MAIN 1
 #include "phar_internal.h"
@@ -2737,7 +2737,7 @@
                }
                /* after excluding deleted files, calculate manifest size in 
bytes and number of entries */
                ++new_manifest_count;
-               phar_add_virtual_dirs(phar, entry->filename, 
entry->filename_len);
+               phar_add_virtual_dirs(phar, entry->filename, 
entry->filename_len TSRMLS_CC);
 
                if (entry->is_dir) {
                        /* we use this to calculate API version, 1.1.1 is used 
for phars with directories */
@@ -3622,7 +3622,7 @@
        php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
        php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
        php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
-       php_info_print_table_row(2, "CVS revision", "$Revision: 1.389 $");
+       php_info_print_table_row(2, "CVS revision", "$Revision: 1.390 $");
        php_info_print_table_row(2, "Phar-based phar archives", "enabled");
        php_info_print_table_row(2, "Tar-based phar archives", "enabled");
        php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.63&r2=1.64&diff_format=u
Index: php-src/ext/phar/tar.c
diff -u php-src/ext/phar/tar.c:1.63 php-src/ext/phar/tar.c:1.64
--- php-src/ext/phar/tar.c:1.63 Sun Oct 12 19:40:29 2008
+++ php-src/ext/phar/tar.c      Sun Oct 12 21:09:10 2008
@@ -620,7 +620,7 @@
                }
        }
 
-       phar_add_virtual_dirs(entry->phar, entry->filename, 
entry->filename_len);
+       phar_add_virtual_dirs(entry->phar, entry->filename, entry->filename_len 
TSRMLS_CC);
        memset((char *) &header, 0, sizeof(header));
 
        if (entry->filename_len > 100) {
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.58&r2=1.59&diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.58 php-src/ext/phar/zip.c:1.59
--- php-src/ext/phar/zip.c:1.58 Sun Oct 12 19:40:29 2008
+++ php-src/ext/phar/zip.c      Sun Oct 12 21:09:10 2008
@@ -704,7 +704,7 @@
                }
        }
 
-       phar_add_virtual_dirs(entry->phar, entry->filename, 
entry->filename_len);
+       phar_add_virtual_dirs(entry->phar, entry->filename, entry->filename_len 
TSRMLS_CC);
        memset(&local, 0, sizeof(local));
        memset(&central, 0, sizeof(central));
        memset(&perms, 0, sizeof(perms));



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php