2 files changed, 0 insertions, 26 deletions
diff --git a/databases/php-adodb-ext/files/extra-patch-php54-adodb.c b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c
index ef2ffb0d8c88..d78d62be0a2c 100644
--- a/databases/php-adodb-ext/files/extra-patch-php54-adodb.c
+++ b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c
@@ -9,29 +9,3 @@
     	PHP_FE(adodb_movenext,NULL) 
  	PHP_FE(adodb_getall,NULL)   
  	{NULL, NULL, NULL} 
-@@ -159,11 +159,11 @@
- 
- static void adodb_init_zval(zval *v, char *s)
- {
--	v->type = IS_STRING;
--	v->value.str.val = s;
--	v->value.str.len = strlen(s);
--	v->is_ref = 0;
--	v->refcount = 1;
-+	Z_TYPE_P(v) = IS_STRING;
-+	Z_STRVAL_P(v) = s;
-+	Z_STRLEN_P(v) = strlen(s);
-+	Z_UNSET_ISREF_P(v);
-+	Z_SET_REFCOUNT_P(v, 1);
- }
- 
- /* {{{ PHP_MINIT_FUNCTION
-@@ -277,7 +277,7 @@
- 	fci.function_table = EG(function_table);
- 	fci.function_name = &adodb_zvals[zval_ocifetch];
- 	fci.symbol_table = NULL;
--	fci.object_pp = NULL;
-+	fci.object_ptr = NULL;
- 	fci.retval_ptr_ptr = &retval;
- 	fci.param_count = 2;
- 	fci.params = &params[1];
diff --git a/databases/php-adodb-ext/files/extra-patch-adodb.c b/databases/php-adodb-ext/files/patch-adodb.c
index 1d31a0848451..1d31a0848451 100644
--- a/databases/php-adodb-ext/files/extra-patch-adodb.c
+++ b/databases/php-adodb-ext/files/patch-adodb.c