php-5.3.3-macropen

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

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 9e9d700cd1f6493e2caf94d7128df02e4bab811f..a9f99c958e4094aabb1780a9691b5bced932ef7e 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -851,7 +851,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 d9e948a623f5098439311a8628325e55704924c3..11610da0aec119832af570ab506750e41dfdb7ef 100644 (file)
--- 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 3de66a4274432d768f7ed2de1349ecc4b4867c7c..c088cc70b60c59c8993fcdf68ff7b76a5403fa4d 100644 (file)
--- 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;