diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_reverse_api.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_reverse_api.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/mysqlnd/mysqlnd_reverse_api.c b/ext/mysqlnd/mysqlnd_reverse_api.c index 553a507818..b358b6d2f2 100644 --- a/ext/mysqlnd/mysqlnd_reverse_api.c +++ b/ext/mysqlnd/mysqlnd_reverse_api.c @@ -31,7 +31,7 @@ static HashTable mysqlnd_api_ext_ht; /* {{{ mysqlnd_reverse_api_init */ PHPAPI void -mysqlnd_reverse_api_init(TSRMLS_D) +mysqlnd_reverse_api_init(void) { zend_hash_init(&mysqlnd_api_ext_ht, 3, NULL, NULL, 1); } @@ -40,7 +40,7 @@ mysqlnd_reverse_api_init(TSRMLS_D) /* {{{ mysqlnd_reverse_api_end */ PHPAPI void -mysqlnd_reverse_api_end(TSRMLS_D) +mysqlnd_reverse_api_end(void) { zend_hash_destroy(&mysqlnd_api_ext_ht); } @@ -49,7 +49,7 @@ mysqlnd_reverse_api_end(TSRMLS_D) /* {{{ myslqnd_get_api_extensions */ PHPAPI HashTable * -mysqlnd_reverse_api_get_api_list(TSRMLS_D) +mysqlnd_reverse_api_get_api_list(void) { return &mysqlnd_api_ext_ht; } @@ -58,7 +58,7 @@ mysqlnd_reverse_api_get_api_list(TSRMLS_D) /* {{{ mysqlnd_reverse_api_register_api */ PHPAPI void -mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext TSRMLS_DC) +mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext) { zend_hash_str_add_ptr(&mysqlnd_api_ext_ht, apiext->module->name, strlen(apiext->module->name), apiext); } @@ -67,17 +67,17 @@ mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext TSRMLS_DC) /* {{{ zval_to_mysqlnd */ PHPAPI MYSQLND * -zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities TSRMLS_DC) +zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities) { MYSQLND * retval; #ifdef OLD_CODE MYSQLND_REVERSE_API * elem; ZEND_HASH_FOREACH_PTR(&mysqlnd_api_ext_ht, elem) { if (elem->conversion_cb) { - retval = elem->conversion_cb(zv TSRMLS_CC); + retval = elem->conversion_cb(zv); if (retval) { if (retval->data) { - *save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities TSRMLS_CC); + *save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities); } return retval; } @@ -87,10 +87,10 @@ zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned MYSQLND_REVERSE_API * api; ZEND_HASH_FOREACH_PTR(&mysqlnd_api_ext_ht, api) { if (api && api->conversion_cb) { - retval = api->conversion_cb(zv TSRMLS_CC); + retval = api->conversion_cb(zv); if (retval) { if (retval->data) { - *save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities TSRMLS_CC); + *save_client_api_capabilities = retval->data->m->negotiate_client_api_capabilities(retval->data, client_api_capabilities); } return retval; } |