sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Unbreak after recent PHP 5.3.2 update

Browse source 
Reported by:	pointyhat
Approved by:	portmgr (itetcu, erwin - blanket)
This commit is contained in:
Greg Larkin 2010-04-12 23:05:46 +00:00
parent 8d496c81f8
commit 78d8fdeba7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=252618
2 changed files with 85 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
devel/pecl-automap/files/patch-Automap.c Normal file
View file

@ -0,0 +1,19 @@
--- ./Automap.c.orig 2010-04-12 16:58:59.000000000 -0400
+++ ./Automap.c 2010-04-12 18:59:40.000000000 -0400
@@ -1617,14 +1617,14 @@
/* }}} */
/*---------------------------------------------------------------*/
-static ZEND_BEGIN_ARG_INFO_EX(Automap_mount_arginfo, 0, 1, 1)
+ZEND_BEGIN_ARG_INFO_EX(Automap_mount_arginfo, 0, 1, 1)
ZEND_ARG_INFO(0, path)
ZEND_ARG_INFO(0, base_dir)
ZEND_ARG_INFO(0, mnt)
ZEND_ARG_INFO(0, flags)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(Automap_autoload_hook_arginfo, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(Automap_autoload_hook_arginfo, 0, 0, 1)
ZEND_ARG_INFO(0, symbol)
ZEND_ARG_INFO(0, type)
ZEND_END_ARG_INFO()

66
devel/pecl-automap/files/patch-utils.c Normal file
View file

@ -0,0 +1,66 @@
--- ./utils.c.orig 2008-01-18 22:07:09.000000000 -0500
+++ ./utils.c 2010-04-12 19:04:13.000000000 -0400
@@ -65,37 +65,37 @@
/*============================================================================*/
/* Generic arginfo structures */
-static ZEND_BEGIN_ARG_INFO_EX(UT_noarg_arginfo, 0, 0, 0)
+ZEND_BEGIN_ARG_INFO_EX(UT_noarg_arginfo, 0, 0, 0)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_noarg_ref_arginfo, 0, 1, 0)
+ZEND_BEGIN_ARG_INFO_EX(UT_noarg_ref_arginfo, 0, 1, 0)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_1arg_arginfo, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(UT_1arg_arginfo, 0, 0, 1)
ZEND_ARG_INFO(0, arg1)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_1arg_ref_arginfo, 0, 1, 1)
+ZEND_BEGIN_ARG_INFO_EX(UT_1arg_ref_arginfo, 0, 1, 1)
ZEND_ARG_INFO(0, arg1)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_2args_arginfo, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(UT_2args_arginfo, 0, 0, 2)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_2args_ref_arginfo, 0, 1, 2)
+ZEND_BEGIN_ARG_INFO_EX(UT_2args_ref_arginfo, 0, 1, 2)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_3args_arginfo, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(UT_3args_arginfo, 0, 0, 3)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_ARG_INFO(0, arg3)
ZEND_END_ARG_INFO()
-static ZEND_BEGIN_ARG_INFO_EX(UT_3args_ref_arginfo, 0, 1, 3)
+ZEND_BEGIN_ARG_INFO_EX(UT_3args_ref_arginfo, 0, 1, 3)
ZEND_ARG_INFO(0, arg1)
ZEND_ARG_INFO(0, arg2)
ZEND_ARG_INFO(0, arg3)
@@ -234,13 +234,13 @@
static void ut_persistent_zval_ptr_dtor(zval ** zval_ptr)
{
- (*zval_ptr)->refcount--;
- if ((*zval_ptr)->refcount == 0) {
+ Z_DELREF_P((*zval_ptr));
+ if (Z_REFCOUNT_P((*zval_ptr)) == 0) {
ut_persistent_zval_dtor(*zval_ptr);
pefree(*zval_ptr, 1);
} else {
- if ((*zval_ptr)->refcount == 1)
- (*zval_ptr)->is_ref = 0;
+ if (Z_REFCOUNT_P((*zval_ptr)) == 1)
+ Z_UNSET_ISREF_P((*zval_ptr));
}
}