diff options
Diffstat (limited to 'lang/php_db4/db4.cpp')
| -rw-r--r-- | lang/php_db4/db4.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lang/php_db4/db4.cpp b/lang/php_db4/db4.cpp index f76e04b0..0e041b42 100644 --- a/lang/php_db4/db4.cpp +++ b/lang/php_db4/db4.cpp @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2015 Oracle and/or its affiliates. All rights reserved. * * http://www.apache.org/licenses/LICENSE-2.0.txt * @@ -146,7 +146,7 @@ static struct my_llist *my_llist_del(struct my_llist *list, void *data) { * * Every user visible function must have an entry in db4_functions[]. */ -function_entry db4_functions[] = { +zend_function_entry db4_functions[] = { /* PHP_FE(db4_dbenv_create, NULL) */ {NULL, NULL, NULL} /* Must be the last line in db4_functions[] */ }; @@ -341,8 +341,10 @@ static zend_function_entry Db4_functions[] = { #ifdef COMPILE_DL_DB4 #ifdef PHP_WIN32 +#if !(PHP_MAJOR_VERSION >= 5 && PHP_MINOR_VERSION >= 3) #include "zend_arg_defs.c" #endif +#endif BEGIN_EXTERN_C() ZEND_GET_MODULE(db4) END_EXTERN_C() @@ -640,7 +642,7 @@ void setDbEnv(zval *z, DB_ENV *dbenv TSRMLS_DC) long rsrc_id; struct php_DB_ENV *pdb = (struct php_DB_ENV *) emalloc(sizeof(*pdb)); pdb->dbenv = dbenv; - rsrc_id = zend_register_resource(NULL, pdb, le_dbenv); + rsrc_id = ZEND_REGISTER_RESOURCE(NULL, pdb, le_dbenv); zend_list_addref(rsrc_id); add_property_resource(z, "_dbenv_ptr", rsrc_id); } @@ -849,7 +851,7 @@ void setDbc(zval *z, DBC *dbc, struct php_DB_TXN *txn TSRMLS_DC) pdbc->parent_txn = txn; txn->open_cursors = my_llist_add(txn->open_cursors, pdbc); } - rsrc_id = zend_register_resource(NULL, pdbc, le_dbc); + rsrc_id = ZEND_REGISTER_RESOURCE(NULL, pdbc, le_dbc); zend_list_addref(rsrc_id); add_property_resource(z, "_dbc_ptr", rsrc_id); } |