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 7982e4255b07c647e410b576f9e754a1b3529904..c4b988c6c550cb322aa11697b8a0eeccd535a093 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -917,7 +917,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 8efc8d45b3ba0353735d19c4e8d75748e04b5b6d..a59121eb5f036d20efd52cc1d2c600319f22bc6d 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, 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 f64db5540ee930d4be984553200d8fb1d7577ae5..5798fb10089af4b8ebd095eef55d7ff34b461f04 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, 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;