diff options
| author | Dmitry Stogov <dmitry@php.net> | 2005-09-20 06:17:30 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2005-09-20 06:17:30 +0000 |
| commit | 140b23620b45baa4a31d8f1601e7a716c0437cfb (patch) | |
| tree | 839d84fd931f056dedf87728f1db73a7519dbc14 /ext/pdo | |
| parent | ebc7bb3a00df815db3945778a1108480f34377f8 (diff) | |
| download | php-git-140b23620b45baa4a31d8f1601e7a716c0437cfb.tar.gz | |
ZTS fix
Diffstat (limited to 'ext/pdo')
| -rwxr-xr-x | ext/pdo/pdo.c | 2 | ||||
| -rwxr-xr-x | ext/pdo/pdo_dbh.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 2518e92520..f43bcf6f90 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -306,7 +306,7 @@ PHP_MINIT_FUNCTION(pdo) #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); diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index c3103c8a71..83e0b5949a 100755 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -84,7 +84,7 @@ void pdo_raise_impl_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt, const char *sqlstate } } 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 @@ void pdo_handle_error(pdo_dbh_t *dbh, pdo_stmt_t *stmt TSRMLS_DC) } } 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); |