diff options
Diffstat (limited to 'dev-php5')
| -rw-r--r-- | dev-php5/adodb-ext/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-php5/adodb-ext/files/php53.patch | 34 |
2 files changed, 22 insertions, 20 deletions
diff --git a/dev-php5/adodb-ext/ChangeLog b/dev-php5/adodb-ext/ChangeLog index 2b72db504f87..e1c477ea9063 100644 --- a/dev-php5/adodb-ext/ChangeLog +++ b/dev-php5/adodb-ext/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php5/adodb-ext -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php5/adodb-ext/ChangeLog,v 1.6 2010/11/03 22:12:52 mabi Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-php5/adodb-ext/ChangeLog,v 1.7 2011/03/06 21:32:07 olemarkus Exp $ + + 06 Mar 2011; <olemarkus@gentoo.org> files/php53.patch: + The old patch seemed to have incorrect line endings in it and would not + apply. #357025 *adodb-ext-504-r2 (03 Nov 2010) diff --git a/dev-php5/adodb-ext/files/php53.patch b/dev-php5/adodb-ext/files/php53.patch index 9b51e3001807..7a9454252386 100644 --- a/dev-php5/adodb-ext/files/php53.patch +++ b/dev-php5/adodb-ext/files/php53.patch @@ -1,21 +1,19 @@ -diff --git a/adodb.c b/adodb.c -index 3afc443..6e3bf95 100644 ---- a/adodb.c -+++ b/adodb.c -@@ -159,11 +159,7 @@ static zval adodb_zvals[5]; - - 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; -+ ZVAL_STRING(v, s, 0); - } - - /* {{{ PHP_MINIT_FUNCTION -@@ -277,7 +273,7 @@ zval **fields; +--- a/adodb.c 2005-11-25 20:00:56.000000000 +0100 ++++ b/adodb.c 2011-03-06 22:27:06.000000000 +0100 +@@ -159,11 +159,7 @@ +
+ 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;
++ ZVAL_STRING(v, s, 0);
+ }
+
+ /* {{{ PHP_MINIT_FUNCTION
+@@ -277,7 +273,7 @@ fci.function_table = EG(function_table); fci.function_name = &adodb_zvals[zval_ocifetch]; fci.symbol_table = NULL; |