[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/standard/ browscap.c

[Antony Dovgal]

tony2001                                 Sun, 01 May 2011 19:46:27 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310693

Log:
fix ZTS build for 5_3, too

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/browscap.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/browscap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/browscap.c        2011-05-01 
19:22:24 UTC (rev 310692)
+++ php/php-src/branches/PHP_5_3/ext/standard/browscap.c        2011-05-01 
19:46:27 UTC (rev 310693)
@@ -348,7 +348,7 @@

 #ifdef ZTS
        ts_allocate_id(&browscap_globals_id, sizeof(browser_data),
-               browscap_globals_ctor, NULL);
+               (ts_allocate_ctor)browscap_globals_ctor, NULL);
 #endif
        /* ctor call not really needed for non-ZTS */

@@ -360,7 +360,7 @@
 {
        browser_data *bdata = &BROWSCAP_G(activation_bdata);
        if (bdata->filename[0] != '\0') {
-               browscap_bdata_dtor(bdata, 0);
+               browscap_bdata_dtor(bdata, 0 TSRMLS_CC);
        }

        return SUCCESS;
@@ -369,7 +369,7 @@

 PHP_MSHUTDOWN_FUNCTION(browscap) /* {{{ */
 {
-       browscap_bdata_dtor(&global_bdata, 1);
+       browscap_bdata_dtor(&global_bdata, 1 TSRMLS_CC);

        return SUCCESS;
 }


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