diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /ext/mysqlnd/mysqlnd_reverse_api.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'ext/mysqlnd/mysqlnd_reverse_api.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_reverse_api.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqlnd/mysqlnd_reverse_api.h b/ext/mysqlnd/mysqlnd_reverse_api.h index 58a1ddd087..2ea0cfd33d 100644 --- a/ext/mysqlnd/mysqlnd_reverse_api.h +++ b/ext/mysqlnd/mysqlnd_reverse_api.h @@ -24,17 +24,17 @@ typedef struct st_mysqlnd_reverse_api { zend_module_entry * module; - MYSQLND *(*conversion_cb)(zval * zv TSRMLS_DC); + MYSQLND *(*conversion_cb)(zval * zv); } MYSQLND_REVERSE_API; -PHPAPI void mysqlnd_reverse_api_init(TSRMLS_D); -PHPAPI void mysqlnd_reverse_api_end(TSRMLS_D); +PHPAPI void mysqlnd_reverse_api_init(void); +PHPAPI void mysqlnd_reverse_api_end(void); -PHPAPI HashTable * mysqlnd_reverse_api_get_api_list(TSRMLS_D); +PHPAPI HashTable * mysqlnd_reverse_api_get_api_list(void); -PHPAPI void mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext TSRMLS_DC); -PHPAPI MYSQLND * zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities TSRMLS_DC); +PHPAPI void mysqlnd_reverse_api_register_api(MYSQLND_REVERSE_API * apiext); +PHPAPI MYSQLND * zval_to_mysqlnd(zval * zv, const unsigned int client_api_capabilities, unsigned int * save_client_api_capabilities); #endif /* MYSQLND_REVERSE_API_H */ |