summaryrefslogtreecommitdiff
path: root/databases/php-adodb-ext/files/extra-patch-adodb.c
diff options
context:
space:
mode:
authorGabor Kovesdan <gabor@FreeBSD.org>2011-08-08 11:04:45 +0000
committerGabor Kovesdan <gabor@FreeBSD.org>2011-08-08 11:04:45 +0000
commit67881bec31eb3cb9d46abae3d7ecc7230750d6ac (patch)
treeab94f0a93455daccbbadde0b2d2baccbf56a547d /databases/php-adodb-ext/files/extra-patch-adodb.c
parent- Update to 0.9 (diff)
- Fix build for newer PHP versions by making PHP 5.2-specific patch optional
PR: ports/159125 Submitted by: Michael Scheidell <scheidell@secnap.net> Approved by: Joe Horn <joehorn@gmail.com> (maintainer)
Notes
Notes: svn path=/head/; revision=279198
Diffstat (limited to 'databases/php-adodb-ext/files/extra-patch-adodb.c')
-rw-r--r--databases/php-adodb-ext/files/extra-patch-adodb.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/databases/php-adodb-ext/files/extra-patch-adodb.c b/databases/php-adodb-ext/files/extra-patch-adodb.c
new file mode 100644
index 000000000000..1d31a0848451
--- /dev/null
+++ b/databases/php-adodb-ext/files/extra-patch-adodb.c
@@ -0,0 +1,28 @@
+--- adodb.c.orig 2010-04-12 20:00:43.000000000 +0800
++++ adodb.c 2010-04-12 20:05:20.000000000 +0800
+@@ -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];