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/pdo/php_pdo_int.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/pdo/php_pdo_int.h')
| -rw-r--r-- | ext/pdo/php_pdo_int.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/pdo/php_pdo_int.h b/ext/pdo/php_pdo_int.h index 23de705ec1..faade8d248 100644 --- a/ext/pdo/php_pdo_int.h +++ b/ext/pdo/php_pdo_int.h @@ -27,40 +27,40 @@ extern HashTable pdo_driver_hash; extern zend_class_entry *pdo_exception_ce; -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); int php_pdo_list_entry(void); -void pdo_dbh_init(TSRMLS_D); -void pdo_stmt_init(TSRMLS_D); +void pdo_dbh_init(void); +void pdo_stmt_init(void); -extern zend_object *pdo_dbh_new(zend_class_entry *ce TSRMLS_DC); +extern zend_object *pdo_dbh_new(zend_class_entry *ce); extern const zend_function_entry pdo_dbh_functions[]; extern zend_class_entry *pdo_dbh_ce; extern ZEND_RSRC_DTOR_FUNC(php_pdo_pdbh_dtor); -extern zend_object *pdo_dbstmt_new(zend_class_entry *ce TSRMLS_DC); +extern zend_object *pdo_dbstmt_new(zend_class_entry *ce); extern const zend_function_entry pdo_dbstmt_functions[]; extern zend_class_entry *pdo_dbstmt_ce; -void pdo_dbstmt_free_storage(zend_object *std TSRMLS_DC); -zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); +void pdo_dbstmt_free_storage(zend_object *std); +zend_object_iterator *pdo_stmt_iter_get(zend_class_entry *ce, zval *object, int by_ref); extern zend_object_handlers pdo_dbstmt_object_handlers; -int pdo_stmt_describe_columns(pdo_stmt_t *stmt TSRMLS_DC); +int pdo_stmt_describe_columns(pdo_stmt_t *stmt); int pdo_stmt_setup_fetch_mode(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int skip_first_arg); -extern zend_object *pdo_row_new(zend_class_entry *ce TSRMLS_DC); +extern zend_object *pdo_row_new(zend_class_entry *ce); extern const zend_function_entry pdo_row_functions[]; extern zend_class_entry *pdo_row_ce; -void pdo_row_free_storage(zend_object *std TSRMLS_DC); +void pdo_row_free_storage(zend_object *std); extern zend_object_handlers pdo_row_object_handlers; -zend_object_iterator *php_pdo_dbstmt_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC); +zend_object_iterator *php_pdo_dbstmt_iter_get(zend_class_entry *ce, zval *object); extern pdo_driver_t *pdo_find_driver(const char *name, int namelen); int pdo_sqlstate_init_error_table(void); void pdo_sqlstate_fini_error_table(void); const char *pdo_sqlstate_state_to_description(char *state); -int pdo_hash_methods(pdo_dbh_object_t *dbh, int kind TSRMLS_DC); +int pdo_hash_methods(pdo_dbh_object_t *dbh, int kind); /* |