diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /ext/pdo/pdo.c | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'ext/pdo/pdo.c')
| -rw-r--r-- | ext/pdo/pdo.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 61c68ff46d..0e2759793b 100644 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -77,7 +77,7 @@ PDO_API char *php_pdo_str_tolower_dup(const char *src, int len) /* {{{ */ } /* }}} */ -PDO_API zend_class_entry *php_pdo_get_exception_base(int root TSRMLS_DC) /* {{{ */ +PDO_API zend_class_entry *php_pdo_get_exception_base(int root) /* {{{ */ { #if defined(HAVE_SPL) if (!root) { @@ -93,7 +93,7 @@ PDO_API zend_class_entry *php_pdo_get_exception_base(int root TSRMLS_DC) /* {{{ } } #endif - return zend_exception_get_default(TSRMLS_C); + return zend_exception_get_default(); } /* }}} */ @@ -309,7 +309,7 @@ PDO_API int php_pdo_parse_data_source(const char *data_source, zend_ulong data_s /* }}} */ static const char digit_vec[] = "0123456789"; -PDO_API char *php_pdo_int64_to_str(pdo_int64_t i64 TSRMLS_DC) /* {{{ */ +PDO_API char *php_pdo_int64_to_str(pdo_int64_t i64) /* {{{ */ { char buffer[65]; char outbuf[65] = ""; @@ -368,12 +368,12 @@ PHP_MINIT_FUNCTION(pdo) INIT_CLASS_ENTRY(ce, "PDOException", NULL); - pdo_exception_ce = zend_register_internal_class_ex(&ce, php_pdo_get_exception_base(0 TSRMLS_CC) TSRMLS_CC); + pdo_exception_ce = zend_register_internal_class_ex(&ce, php_pdo_get_exception_base(0)); - zend_declare_property_null(pdo_exception_ce, "errorInfo", sizeof("errorInfo")-1, ZEND_ACC_PUBLIC TSRMLS_CC); + zend_declare_property_null(pdo_exception_ce, "errorInfo", sizeof("errorInfo")-1, ZEND_ACC_PUBLIC); - pdo_dbh_init(TSRMLS_C); - pdo_stmt_init(TSRMLS_C); + pdo_dbh_init(); + pdo_stmt_init(); return SUCCESS; } |