From 78d8fdeba7facd6caf09907f6884dcceb51e35a9 Mon Sep 17 00:00:00 2001 From: Greg Larkin Date: Mon, 12 Apr 2010 23:05:46 +0000 Subject: [PATCH] - Unbreak after recent PHP 5.3.2 update Reported by: pointyhat Approved by: portmgr (itetcu, erwin - blanket) --- devel/pecl-automap/files/patch-Automap.c | 19 +++++++ devel/pecl-automap/files/patch-utils.c | 66 ++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 devel/pecl-automap/files/patch-Automap.c create mode 100644 devel/pecl-automap/files/patch-utils.c diff --git a/devel/pecl-automap/files/patch-Automap.c b/devel/pecl-automap/files/patch-Automap.c new file mode 100644 index 000000000000..8a6166ab23a3 --- /dev/null +++ b/devel/pecl-automap/files/patch-Automap.c @@ -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() diff --git a/devel/pecl-automap/files/patch-utils.c b/devel/pecl-automap/files/patch-utils.c new file mode 100644 index 000000000000..0102cfb9520a --- /dev/null +++ b/devel/pecl-automap/files/patch-utils.c @@ -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)); + } + } +