From 612e7077d6adbb39c75ded68c10df621910d18a6 Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Fri, 31 Dec 2010 14:07:47 +0000
Subject: [PATCH] - Fix build on ZTS

---
 v8js_convert.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/v8js_convert.cc b/v8js_convert.cc
index 7b625a2..c338288 100644
--- a/v8js_convert.cc
+++ b/v8js_convert.cc
@@ -41,11 +41,11 @@ static v8::Handle<v8::Value> php_v8js_php_callback(const v8::Arguments &args) /*
 	zend_fcall_info fci;
 	zend_fcall_info_cache fcc;
 	zval fname, *retval_ptr = NULL, **argv = NULL;
+	TSRMLS_FETCH();
 	zend_class_entry *ce = Z_OBJCE_P(value);
 	zend_uint argc = args.Length(), min_num_args = 0, max_num_args = 0;
 	char *error;
 	int error_len, i, flags = V8JS_FLAG_NONE;
-	TSRMLS_FETCH();
 
 	/* Set method_ptr from v8::External or fetch the closure invoker */
 	if (!args.Data().IsEmpty() && args.Data()->IsExternal()) {
@@ -569,7 +569,7 @@ int v8js_to_zval(v8::Handle<v8::Value> jsValue, zval *return_value, int flags TS
 	else if (jsValue->IsObject())
 	{
 		if ((flags & V8JS_FLAG_FORCE_ARRAY) || jsValue->IsArray()) {
-			array_init(return_value TSRMLS_CC);
+			array_init(return_value);
 			return php_v8js_v8_get_properties_hash(jsValue, Z_ARRVAL_P(return_value), flags TSRMLS_CC);
 		} else {
 			php_v8js_create_v8(return_value, jsValue, flags TSRMLS_CC);