Permalink
Browse files

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

This PR was merged into the master branch.

Discussion
----------

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

This reverts commit 347bc81

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)"
  • Loading branch information...
2 parents 0bf57a8 + 4383388 commit ff724c81cabe0fe6b9cffdb6fed55a92e34ba2e8 @fabpot committed Mar 22, 2013
Showing with 3 additions and 0 deletions.
  1. +3 −0 ext/twig/twig.c
View
@@ -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;

0 comments on commit ff724c8

Please sign in to comment.