diff options
| author | Michael Scheidell <scheidell@FreeBSD.org> | 2012-05-26 11:11:12 +0000 |
|---|---|---|
| committer | Michael Scheidell <scheidell@FreeBSD.org> | 2012-05-26 11:11:12 +0000 |
| commit | 2c46b870212f8d41d2d1743084a85d021bf608c1 (patch) | |
| tree | 2c197fc19b812dfdc70e25f036264f8afb5880ef /databases/php-adodb-ext/files/extra-patch-php54-adodb.c | |
| parent | - Upgrade to 0.11. (diff) | |
- Fix for building failed with PHP 5.4
- Bump PORTREVISION
PR: ports/168302
Submitted by: Joe Horn <joehorn@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=297471
Diffstat (limited to 'databases/php-adodb-ext/files/extra-patch-php54-adodb.c')
| -rw-r--r-- | databases/php-adodb-ext/files/extra-patch-php54-adodb.c | 37 |
1 files changed, 37 insertions, 0 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 new file mode 100644 index 000000000000..0c2db9a281e2 --- /dev/null +++ b/databases/php-adodb-ext/files/extra-patch-php54-adodb.c @@ -0,0 +1,37 @@ +--- adodb.c.orig 2012-05-20 14:42:41.000000000 +0000 ++++ adodb.c 2012-05-20 14:41:28.000000000 +0000 +@@ -108,7 +108,7 @@ + }; + #else + /* PHP 5 */ +-function_entry adodb_functions[] = { ++zend_function_entry adodb_functions[] = { + 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 = ¶ms[1];
\ No newline at end of file |