cvs: php-src /ext/pdo_pgsql pgsql_driver.c /ext/standard basic_functions.c

bjori Sat Dec 16 18:27:43 2006 UTC Modified files: /php-src/ext/standard basic_functions.c /php-src/ext/pdo_pgsql pgsql_driver.c Log: Fix ZTS build http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.833&r2=1.834&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.833 php-src/ext/standard/basic_functions.c:1.834 --- php-src/ext/standard/basic_functions.c:1.833 Fri Dec 15 23:28:10 2006 +++ php-src/ext/standard/basic_functions.c Sat Dec 16 18:27:43 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.833 2006/12/15 23:28:10 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.834 2006/12/16 18:27:43 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -5573,6 +5573,7 @@ zval *ini_array = va_arg(args, zval *); int module_number = va_arg(args, int); zval *option; + TSRMLS_FETCH(); if (module_number != 0 && ini_entry->module_number != module_number) { return 0; @@ -5707,7 +5708,7 @@ char *temp; int temp_len; - zend_unicode_to_string(UG(utf8_conv), &temp, &temp_len, new_value.u, new_value_len); + zend_unicode_to_string(UG(utf8_conv), &temp, &temp_len, new_value.u, new_value_len TSRMLS_CC); new_value.s = temp; new_value_len = temp_len; } http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.63&r2=1.64&diff_format=u Index: php-src/ext/pdo_pgsql/pgsql_driver.c diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.63 php-src/ext/pdo_pgsql/pgsql_driver.c:1.64 --- php-src/ext/pdo_pgsql/pgsql_driver.c:1.63 Wed Nov 29 15:47:41 2006 +++ php-src/ext/pdo_pgsql/pgsql_driver.c Sat Dec 16 18:27:43 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql_driver.c,v 1.63 2006/11/29 15:47:41 iliaa Exp $ */ +/* $Id: pgsql_driver.c,v 1.64 2006/12/16 18:27:43 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -87,7 +87,7 @@ } if (!dbh->methods) { - zend_throw_exception_ex(php_pdo_get_exception(TSRMLS_C), 0 TSRMLS_CC, "SQLSTATE[%s] [%d] %s", + zend_throw_exception_ex(php_pdo_get_exception(), 0 TSRMLS_CC, "SQLSTATE[%s] [%d] %s", *pdo_err, einfo->errcode, einfo->errmsg); }