merged branch weltling/master (PR twigphp#854)

This PR was merged into the master branch.

Commits
-------

b013ede fix windows build

Discussion
----------

Trivial fix for windows build

ext/twig/twig.c

@@ -512,9 +512,9 @@ void TWIG_NEW(zval *object, char *class, zval *arg0, zval *arg1 TSRMLS_DC)
 
 static int twig_add_array_key_to_string(void *pDest APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	APPLY_TSRMLS_FETCH();
 	smart_str *buf;
 	char *joiner;
+	APPLY_TSRMLS_FETCH();
 
 	buf = va_arg(args, smart_str*);
 	joiner = va_arg(args, char*);
@@ -582,11 +582,11 @@ char *TWIG_GET_CLASS_NAME(zval *object TSRMLS_DC)
 
 static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	APPLY_TSRMLS_FETCH();
 	zval *retval;
 	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;
@@ -605,11 +605,11 @@ static int twig_add_method_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, v
 
 static int twig_add_property_to_class(void *pDest APPLY_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
-	APPLY_TSRMLS_FETCH();
 	zend_class_entry *ce;
 	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;