diff options
Diffstat (limited to 'databases/php-adodb-ext/files')
-rw-r--r-- | databases/php-adodb-ext/files/extra-patch-php54-adodb.c | 11 | ||||
-rw-r--r-- | databases/php-adodb-ext/files/patch-adodb.c | 28 |
2 files changed, 0 insertions, 39 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 deleted file mode 100644 index d78d62be0a2c..000000000000 --- a/databases/php-adodb-ext/files/extra-patch-php54-adodb.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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} diff --git a/databases/php-adodb-ext/files/patch-adodb.c b/databases/php-adodb-ext/files/patch-adodb.c deleted file mode 100644 index 1d31a0848451..000000000000 --- a/databases/php-adodb-ext/files/patch-adodb.c +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 = ¶ms[1]; |