geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 04:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged branch tucksaun/fix-5.2-TSRM (PR #1037)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6e

This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)

Commits
-------

4383388 Revert "merged branch pierrejoye/master (PR #855)"
This commit is contained in:
Fabien Potencier
2013-03-22 16:32:12 +01:00
parent 0bf57a8c9a 438338827b
commit ff724c81ca
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/twig/twig.c
+3
View File
@@ -511,6 +511,7 @@ static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_arg
{
smart_str *buf;
char *joiner;
APPLY_TSRMLS_FETCH();
buf = va_arg(args, smart_str*);
joiner = va_arg(args, char*);
@@ -643,6 +644,7 @@ static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, v
char *item;
size_t item_len;
zend_function *mptr = (zend_function *) pDest;
APPLY_TSRMLS_FETCH();
if (!(mptr->common.fn_flags & ZEND_ACC_PUBLIC)) {
return 0;
@@ -665,6 +667,7 @@ static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args,
zval *retval;
char *class_name, *prop_name;
zend_property_info *pptr = (zend_property_info *) pDest;
APPLY_TSRMLS_FETCH();
if (!(pptr->flags & ZEND_ACC_PUBLIC)) {
return 0;