From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 21 Nov 2011 11:09:34 +0000 (+0000)
Subject: Merge branch 'master' of github.com:derickr/twig-ext
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=c4a7d1983dab7e2818cca3c4896704f4fce7becc;p=web%2Fkonrad%2Ftwig.git

Merge branch 'master' of github.com:derickr/twig-ext

Conflicts:
	ext/twig/twig.c
---

c4a7d1983dab7e2818cca3c4896704f4fce7becc
diff --cc ext/twig/twig.c
index 4ceca77,1d031e2..9c85ea1
--- a/ext/twig/twig.c
+++ b/ext/twig/twig.c
@@@ -276,12 -276,8 +276,12 @@@ zval *TWIG_GET_STATIC_PROPERTY(zval *cl
  		return NULL;
  	}
  
- 	ce = zend_get_class_entry(class);
+ 	ce = zend_get_class_entry(class TSRMLS_CC);
 +#if PHP_VERSION_ID >= 50400
 +	tmp_zval = zend_std_get_static_property(ce, prop_name, strlen(prop_name), 0, NULL TSRMLS_CC);
 +#else
  	tmp_zval = zend_std_get_static_property(ce, prop_name, strlen(prop_name), 0 TSRMLS_CC);
 +#endif
  	return *tmp_zval;
  }
  
@@@ -366,14 -358,10 +366,14 @@@ zval *TWIG_PROPERTY(zval *object, zval 
  	return tmp;
  }
  
- int TWIG_HAS_PROPERTY(zval *object, zval *propname)
+ int TWIG_HAS_PROPERTY(zval *object, zval *propname TSRMLS_DC)
  {
  	if (Z_OBJ_HT_P(object)->has_property) {
 +#if PHP_VERSION_ID >= 50400
 +		return Z_OBJ_HT_P(object)->has_property(object, propname, 0, NULL TSRMLS_CC);
 +#else
  		return Z_OBJ_HT_P(object)->has_property(object, propname, 0 TSRMLS_CC);
 +#endif
  	}
  	return 0;
  }