cvs: php-src /ext/pdo pdo.c pdo_dbh.c

dmitry Tue Sep 20 02:17:32 2005 EDT Modified files: /php-src/ext/pdo pdo.c pdo_dbh.c Log: ZTS fix http://cvs.php.net/diff.php/php-src/ext/pdo/pdo.c?r1=1.62&r2=1.63&ty=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.62 php-src/ext/pdo/pdo.c:1.63 --- php-src/ext/pdo/pdo.c:1.62 Mon Sep 19 20:33:39 2005 +++ php-src/ext/pdo/pdo.c Tue Sep 20 02:17:30 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.62 2005/09/20 00:33:39 iliaa Exp $ */ +/* $Id: pdo.c,v 1.63 2005/09/20 06:17:30 dmitry Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -306,7 +306,7 @@ #if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1)) pdo_exception_ce = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, NULL TSRMLS_CC); #else - pdo_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default(), NULL TSRMLS_CC); + pdo_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC); #endif zend_declare_property_null(pdo_exception_ce, "errorInfo", sizeof("errorInfo")-1, ZEND_ACC_PUBLIC TSRMLS_CC); http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_dbh.c?r1=1.91&r2=1.92&ty=u Index: php-src/ext/pdo/pdo_dbh.c diff -u php-src/ext/pdo/pdo_dbh.c:1.91 php-src/ext/pdo/pdo_dbh.c:1.92 --- php-src/ext/pdo/pdo_dbh.c:1.91 Mon Sep 19 20:33:39 2005 +++ php-src/ext/pdo/pdo_dbh.c Tue Sep 20 02:17:30 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_dbh.c,v 1.91 2005/09/20 00:33:39 iliaa Exp $ */ +/* $Id: pdo_dbh.c,v 1.92 2005/09/20 06:17:30 dmitry Exp $ */ /* The PDO Database Handle Class */ @@ -84,7 +84,7 @@ } } else { zval *ex; - zend_class_entry *def_ex = zend_exception_get_default(), *pdo_ex = php_pdo_get_exception(TSRMLS_C); + zend_class_entry *def_ex = zend_exception_get_default(TSRMLS_C), *pdo_ex = php_pdo_get_exception(TSRMLS_C); MAKE_STD_ZVAL(ex); object_init_ex(ex, pdo_ex); @@ -165,7 +165,7 @@ } } else if (EG(exception) == NULL) { zval *ex; - zend_class_entry *def_ex = zend_exception_get_default(), *pdo_ex = php_pdo_get_exception(TSRMLS_C); + zend_class_entry *def_ex = zend_exception_get_default(TSRMLS_C), *pdo_ex = php_pdo_get_exception(TSRMLS_C); MAKE_STD_ZVAL(ex); object_init_ex(ex, pdo_ex);