37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
--- php-5.2.3/ext/dba/dba.c.macropen
|
|
+++ php-5.2.3/ext/dba/dba.c
|
|
@@ -930,7 +930,7 @@
|
|
}
|
|
}
|
|
|
|
- if (error || hptr->open(info, &error TSRMLS_CC) != SUCCESS) {
|
|
+ if (error || (hptr->open)(info, &error TSRMLS_CC) != SUCCESS) {
|
|
dba_close(info TSRMLS_CC);
|
|
php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]), Z_STRVAL_PP(args[1]), E_WARNING, "Driver initialization failed for handler: %s%s%s", hptr->name, error?": ":"", error?error:"");
|
|
FREENOW;
|
|
--- php-5.2.3/ext/dba/dba_db3.c.macropen
|
|
+++ php-5.2.3/ext/dba/dba_db3.c
|
|
@@ -91,7 +91,7 @@
|
|
|
|
if ((err=db_create(&dbp, NULL, 0)) == 0) {
|
|
dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
|
|
- if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
|
|
+ if ((err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
|
|
dba_db3_data *data;
|
|
|
|
data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
|
|
--- php-5.2.3/ext/dba/dba_db4.c.macropen
|
|
+++ php-5.2.3/ext/dba/dba_db4.c
|
|
@@ -99,9 +99,9 @@
|
|
dbp->set_errcall(dbp, php_dba_db4_errcall_fcn);
|
|
if (
|
|
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
|
|
- (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
|
|
+ (err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) {
|
|
#else
|
|
- (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
|
|
+ (err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
|
|
#endif
|
|
dba_db4_data *data;
|
|
|