From fe6f8712a439c8b5046a03bca9ce5ae8e75aa4f5 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Fri, 27 Jul 2001 10:16:41 +0000 Subject: - Get rid of ELS_*(), and use TSRMLS_*() instead. - Move to the new ts_allocate_id() API This patch is *bound* to break some files, as I must have had typos somewhere. If you use any uncommon extension, please try to build it... --- ext/pgsql/pgsql.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/pgsql/pgsql.c') diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index f4bf477b66..46f3708838 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -235,7 +235,7 @@ PHP_INI_END() /* {{{ php_pgsql_init_globals */ -static void php_pgsql_init_globals(PGLS_D) +static void php_pgsql_init_globals(PGLS_D TSRMLS_DC) { PGG(num_persistent) = 0; PGG(ignore_notices) = 0; @@ -248,9 +248,9 @@ static void php_pgsql_init_globals(PGLS_D) PHP_MINIT_FUNCTION(pgsql) { #ifdef ZTS - pgsql_globals_id = ts_allocate_id(sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL); + ts_allocate_id(&pgsql_globals_id, sizeof(php_pgsql_globals), (ts_allocate_ctor) php_pgsql_init_globals, NULL); #else - php_pgsql_init_globals(PGLS_C); + php_pgsql_init_globals(PGLS_C TSRMLS_CC); #endif REGISTER_INI_ENTRIES(); @@ -295,7 +295,7 @@ PHP_RINIT_FUNCTION(pgsql) */ PHP_RSHUTDOWN_FUNCTION(pgsql) { - ELS_FETCH(); + TSRMLS_FETCH(); zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_transactions); return SUCCESS; } -- cgit v1.2.1