| 1 |
slords |
1.1 |
--- php-5.2.3/ext/dba/dba.c.macropen |
| 2 |
|
|
+++ php-5.2.3/ext/dba/dba.c |
| 3 |
|
|
@@ -930,7 +930,7 @@ |
| 4 |
|
|
} |
| 5 |
|
|
} |
| 6 |
|
|
|
| 7 |
|
|
- if (error || hptr->open(info, &error TSRMLS_CC) != SUCCESS) { |
| 8 |
|
|
+ if (error || (hptr->open)(info, &error TSRMLS_CC) != SUCCESS) { |
| 9 |
|
|
dba_close(info TSRMLS_CC); |
| 10 |
|
|
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:""); |
| 11 |
|
|
FREENOW; |
| 12 |
|
|
--- php-5.2.3/ext/dba/dba_db3.c.macropen |
| 13 |
|
|
+++ php-5.2.3/ext/dba/dba_db3.c |
| 14 |
|
|
@@ -91,7 +91,7 @@ |
| 15 |
|
|
|
| 16 |
|
|
if ((err=db_create(&dbp, NULL, 0)) == 0) { |
| 17 |
|
|
dbp->set_errcall(dbp, php_dba_db3_errcall_fcn); |
| 18 |
|
|
- if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) { |
| 19 |
|
|
+ if ((err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) { |
| 20 |
|
|
dba_db3_data *data; |
| 21 |
|
|
|
| 22 |
|
|
data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT); |
| 23 |
|
|
--- php-5.2.3/ext/dba/dba_db4.c.macropen |
| 24 |
|
|
+++ php-5.2.3/ext/dba/dba_db4.c |
| 25 |
|
|
@@ -99,9 +99,9 @@ |
| 26 |
|
|
dbp->set_errcall(dbp, php_dba_db4_errcall_fcn); |
| 27 |
|
|
if ( |
| 28 |
|
|
#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) |
| 29 |
|
|
- (err=dbp->open(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) { |
| 30 |
|
|
+ (err=(dbp->open)(dbp, 0, info->path, NULL, type, gmode, filemode)) == 0) { |
| 31 |
|
|
#else |
| 32 |
|
|
- (err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) { |
| 33 |
|
|
+ (err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) { |
| 34 |
|
|
#endif |
| 35 |
|
|
dba_db4_data *data; |
| 36 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
