From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
Date: Sat, 2 May 2015 08:26:55 +0000 (+0200)
Subject: php-5.3.3-macropen
X-Git-Tag: archive/raspbian/8.4.16-1_deb13u1+rpi1^2~31
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=89485b9ba4af147527493435811c8b9302eb3e03;p=php8.4.git

php-5.3.3-macropen


Gbp-Pq: Name 0016-php-5.3.3-macropen.patch
---

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 29e996e4..d22f7d6a 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -937,7 +937,7 @@ restart:
 		}
 	}
 
-	if (error || hptr->open(connection->info, &error) == FAILURE) {
+	if (error || (hptr->open)(connection->info, &error) == FAILURE) {
 		if (EXPECTED(!EG(exception))) {
 			if (error) {
 				php_error_docref(NULL, E_WARNING, "Driver initialization failed for handler: %s: %s", hptr->name, error);
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index 8efc8d45..a59121eb 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, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
+			(err=(dbp->open)(dbp, 0, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
 #else
-			(err=dbp->open(dbp, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
+			(err=(dbp->open)(dbp, ZSTR_VAL(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 f64db554..5798fb10 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, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
+			(err=(dbp->open)(dbp, 0, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
 #else
-			(err=dbp->open(dbp, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
+			(err=(dbp->open)(dbp, ZSTR_VAL(info->path), NULL, type, gmode, filemode)) == 0) {
 #endif
 			dba_db4_data *data;