From f4332a90ac293ecc0595e5c4af0199436cd197ff Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 10 Jun 2012 07:12:19 +0200
Subject: repo reorg

---
 php-5.3.3-macropen.patch | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 php-5.3.3-macropen.patch

(limited to 'php-5.3.3-macropen.patch')

diff --git a/php-5.3.3-macropen.patch b/php-5.3.3-macropen.patch
new file mode 100644
index 0000000..be409e8
--- /dev/null
+++ b/php-5.3.3-macropen.patch
@@ -0,0 +1,39 @@
+diff -up php5.3-201006130830/ext/dba/dba.c.macropen php5.3-201006130830/ext/dba/dba.c
+--- php5.3-201006130830/ext/dba/dba.c.macropen	2010-03-03 02:35:57.000000000 +0100
++++ php5.3-201006130830/ext/dba/dba.c	2010-06-13 11:07:54.501185871 +0200
+@@ -912,7 +912,7 @@ static void php_dba_open(INTERNAL_FUNCTI
+ 		}
+ 	}
+ 
+-	if (error || hptr->open(info, &error TSRMLS_CC) != SUCCESS) {
++	if (error || (hptr->open)(info, &error TSRMLS_CC) != SUCCESS) {
+ 		dba_close(info TSRMLS_CC);
+ 		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:"");
+ 		FREENOW;
+diff -up php5.3-201006130830/ext/dba/dba_db3.c.macropen php5.3-201006130830/ext/dba/dba_db3.c
+--- php5.3-201006130830/ext/dba/dba_db3.c.macropen	2010-01-03 10:36:52.000000000 +0100
++++ php5.3-201006130830/ext/dba/dba_db3.c	2010-06-13 11:07:54.501185871 +0200
+@@ -91,7 +91,7 @@ DBA_OPEN_FUNC(db3)
+ 
+ 	if ((err=db_create(&dbp, NULL, 0)) == 0) {
+ 	    dbp->set_errcall(dbp, php_dba_db3_errcall_fcn);
+-	    if ((err=dbp->open(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
++	    if ((err=(dbp->open)(dbp, info->path, NULL, type, gmode, filemode)) == 0) {
+ 			dba_db3_data *data;
+ 
+ 			data = pemalloc(sizeof(*data), info->flags&DBA_PERSISTENT);
+diff -up php5.3-201006130830/ext/dba/dba_db4.c.macropen php5.3-201006130830/ext/dba/dba_db4.c
+--- php5.3-201006130830/ext/dba/dba_db4.c.macropen	2010-06-03 10:35:55.000000000 +0200
++++ php5.3-201006130830/ext/dba/dba_db4.c	2010-06-13 11:12:11.841435434 +0200
+@@ -125,9 +125,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;
+ 
-- 
cgit