From b85c38bd2fd0b0d7045e5b97c97bc32b8a7e462b Mon Sep 17 00:00:00 2001 From: Debian PHP Maintainers Date: Sat, 2 May 2015 10:26:55 +0200 Subject: [PATCH] php-5.3.3-macropen Gbp-Pq: Name 0017-php-5.3.3-macropen.patch --- ext/dba/dba.c | 2 +- ext/dba/dba_db3.c | 4 ++-- ext/dba/dba_db4.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/dba/dba.c b/ext/dba/dba.c index 64f8b5be..d28b8f5c 100644 --- a/ext/dba/dba.c +++ b/ext/dba/dba.c @@ -858,7 +858,7 @@ restart: } } - if (error || hptr->open(info, &error) == FAILURE) { + if (error || (hptr->open)(info, &error) == FAILURE) { dba_close(info); if (EXPECTED(!EG(exception))) { if (error) { diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c index d9e948a6..11610da0 100644 --- a/ext/dba/dba_db3.c +++ b/ext/dba/dba_db3.c @@ -81,9 +81,9 @@ DBA_OPEN_FUNC(db3) dbp->set_errcall(dbp, php_dba_db3_errcall_fcn); if( #if (DB_VERSION_MAJOR > 4 || (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_db3_data *data; diff --git a/ext/dba/dba_db4.c b/ext/dba/dba_db4.c index 3de66a42..c088cc70 100644 --- a/ext/dba/dba_db4.c +++ b/ext/dba/dba_db4.c @@ -110,9 +110,9 @@ DBA_OPEN_FUNC(db4) dbp->set_errcall(dbp, php_dba_db4_errcall_fcn); if ( #if (DB_VERSION_MAJOR > 4 || (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; -- 2.30.2