mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

- 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-16 23:47:31 +00:00
parent a40a88e7e8
commit 292e5f4a1d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=252780
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/pecl-params/Makefile
View File

@ -20,8 +20,6 @@ USE_PHP= yes
USE_PHP_BUILD= yes
USE_PHPEXT= yes
BROKEN= Does not compile with PHP 5.3
CONFIGURE_ARGS= --enable-params
.include <bsd.port.mk>

29
devel/pecl-params/files/patch-php_params.c Normal file
View File

@ -0,0 +1,29 @@
--- ./php_params.c.orig 2010-04-16 19:41:28.000000000 -0400
+++ ./php_params.c 2010-04-16 19:45:52.000000000 -0400
@@ -65,7 +65,7 @@
static inline int php_params_get_args(int *pargc, zval ***pargv TSRMLS_DC)
{
- void **p = EG(argument_stack).top_element - 2;
+ void **p = EG(argument_stack)->top - 2;
int pp_arg_count = PHP_PARAMS_INT_CAST *p;
p -= 1 + pp_arg_count;
@@ -75,7 +75,7 @@
}
--p;
- if (p < EG(argument_stack).elements) {
+ if (p < ZEND_VM_STACK_ELEMETS(EG(argument_stack))) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot use this function from the global scope");
return FAILURE;
}
@@ -476,7 +476,7 @@
/* }}} */
#ifdef ZEND_ENGINE_2
-static ZEND_BEGIN_ARG_INFO_EX(params_parse_arginfo, 0, ZEND_RETURN_VALUE, 1)
+ZEND_BEGIN_ARG_INFO_EX(params_parse_arginfo, 0, ZEND_RETURN_VALUE, 1)
ZEND_ARG_INFO(0, format)
ZEND_END_ARG_INFO()
#else