mirror of
https://git.freebsd.org/ports.git
synced 2025-06-14 17:20:29 -04:00
2c46b87021
- Bump PORTREVISION PR: ports/168302 Submitted by: Joe Horn <joehorn@gmail.com> (maintainer)
37 lines
No EOL
931 B
C
37 lines
No EOL
931 B
C
--- 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];
|