mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-24 09:25:01 +00:00
Code Issues Releases Activity

- Drop some patches no longer needed.

Browse Source
This commit is contained in:
Martin Wilke 2013-02-01 16:17:00 +00:00
parent 4931cc71ee
commit 9ea6cc8ebc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=311387
3 changed files with 0 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archivers/pecl-phk/files/patch-PHK.c
View File

@ -1,11 +0,0 @@
--- ./PHK.c.orig 2010-04-12 20:08:05.000000000 -0400
+++ ./PHK.c 2010-04-12 20:08:15.000000000 -0400
@@ -1086,7 +1086,7 @@
/* }}} */
/*---------------------------------------------------------------*/
-static ZEND_BEGIN_ARG_INFO_EX(PHK_prolog_arginfo, 0, 0, 3)
+ZEND_BEGIN_ARG_INFO_EX(PHK_prolog_arginfo, 0, 0, 3)
ZEND_ARG_INFO(0, file)
ZEND_ARG_INFO(1, cmd)
ZEND_ARG_INFO(1, ret)

11
archivers/pecl-phk/files/patch-PHK_Stream.c
View File

@ -1,11 +0,0 @@
--- ./PHK_Stream.c.orig 2010-04-12 20:07:31.000000000 -0400
+++ ./PHK_Stream.c 2010-04-12 20:07:39.000000000 -0400
@@ -921,7 +921,7 @@
/*---------------------------------------------------------------*/
-static ZEND_BEGIN_ARG_INFO_EX(PHK_Stream_get_file_arginfo, 0, 0, 6)
+ZEND_BEGIN_ARG_INFO_EX(PHK_Stream_get_file_arginfo, 0, 0, 6)
ZEND_ARG_INFO(0, dir)
ZEND_ARG_INFO(0, uri)
ZEND_ARG_INFO(0, mnt)

66
archivers/pecl-phk/files/patch-utils.c
View File

@ -1,66 +0,0 @@
--- ./utils.c.orig 2010-04-12 20:05:49.000000000 -0400
+++ ./utils.c 2010-04-12 20:07:15.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))) {
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));
}
}