Skip to content

Commit 24bb176

Browse files
stesiestesie
committed
remove TSRMLS_DC, TSRMLS_CC
1 parent d97832d commit 24bb176

16 files changed

+193
-193
lines changed

‎php_v8js_macros.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@ v8::Local<v8::Value> zval_to_v8js(zval *, v8::Isolate *);
8585
v8::Local<v8::Value> zend_long_to_v8js(zend_long, v8::Isolate *);
8686

8787
/* Convert V8 value into zval */
88-
int v8js_to_zval(v8::Local<v8::Value>, zval *, int, v8::Isolate * TSRMLS_DC);
88+
int v8js_to_zval(v8::Local<v8::Value>, zval *, int, v8::Isolate *);
8989

9090
struct v8js_accessor_ctx
9191
{
9292
zend_string *variable_name;
9393
v8::Isolate *isolate;
9494
};
9595

96-
void v8js_accessor_ctx_dtor(v8js_accessor_ctx * TSRMLS_DC);
96+
void v8js_accessor_ctx_dtor(v8js_accessor_ctx *);
9797

9898
/* Register accessors into passed object */
99-
void v8js_register_accessors(std::vector<v8js_accessor_ctx*> *accessor_list, v8::Local<v8::FunctionTemplate>, zval *, v8::Isolate * TSRMLS_DC);
99+
void v8js_register_accessors(std::vector<v8js_accessor_ctx*> *accessor_list, v8::Local<v8::FunctionTemplate>, zval *, v8::Isolate *);
100100

101101

102102
/* Forward declarations */

‎v8js_array_access.cc

+17-17
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extern "C" {
2929
}
3030

3131
static zval v8js_array_access_dispatch(zend_object *object, const char *method_name, int param_count,
32-
uint32_t index, zval zvalue TSRMLS_DC) /* {{{ */
32+
uint32_t index, zval zvalue) /* {{{ */
3333
{
3434
zend_fcall_info fci;
3535
zval php_value;
@@ -52,7 +52,7 @@ static zval v8js_array_access_dispatch(zend_object *object, const char *method_n
5252
fci.object = object;
5353
fci.no_separation = 0;
5454

55-
zend_call_function(&fci, NULL TSRMLS_CC);
55+
zend_call_function(&fci, NULL);
5656
zval_dtor(&fci.function_name);
5757
return php_value;
5858
}
@@ -72,8 +72,8 @@ void v8js_array_access_getter(uint32_t index, const v8::PropertyCallbackInfo<v8:
7272
zval zvalue;
7373
ZVAL_UNDEF(&zvalue);
7474

75-
zval php_value = v8js_array_access_dispatch(object, "offsetGet", 1, index, zvalue TSRMLS_CC);
76-
v8::Local<v8::Value> ret_value = zval_to_v8js(&php_value, isolate TSRMLS_CC);
75+
zval php_value = v8js_array_access_dispatch(object, "offsetGet", 1, index, zvalue);
76+
v8::Local<v8::Value> ret_value = zval_to_v8js(&php_value, isolate);
7777
zval_ptr_dtor(&php_value);
7878

7979
info.GetReturnValue().Set(ret_value);
@@ -93,12 +93,12 @@ void v8js_array_access_setter(uint32_t index, v8::Local<v8::Value> value,
9393
zval zvalue;
9494
ZVAL_UNDEF(&zvalue);
9595

96-
if (v8js_to_zval(value, &zvalue, 0, isolate TSRMLS_CC) != SUCCESS) {
96+
if (v8js_to_zval(value, &zvalue, 0, isolate) != SUCCESS) {
9797
info.GetReturnValue().Set(v8::Local<v8::Value>());
9898
return;
9999
}
100100

101-
zval php_value = v8js_array_access_dispatch(object, "offsetSet", 2, index, zvalue TSRMLS_CC);
101+
zval php_value = v8js_array_access_dispatch(object, "offsetSet", 2, index, zvalue);
102102
zval_ptr_dtor(&php_value);
103103

104104
/* simply pass back the value to tell we intercepted the call
@@ -112,15 +112,15 @@ void v8js_array_access_setter(uint32_t index, v8::Local<v8::Value> value,
112112
/* }}} */
113113

114114

115-
static int v8js_array_access_get_count_result(zend_object *object TSRMLS_DC) /* {{{ */
115+
static int v8js_array_access_get_count_result(zend_object *object) /* {{{ */
116116
{
117117
zval zvalue;
118118
ZVAL_UNDEF(&zvalue);
119119

120-
zval php_value = v8js_array_access_dispatch(object, "count", 0, 0, zvalue TSRMLS_CC);
120+
zval php_value = v8js_array_access_dispatch(object, "count", 0, 0, zvalue);
121121

122122
if(Z_TYPE(php_value) != IS_LONG) {
123-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Non-numeric return value from count() method");
123+
php_error_docref(NULL, E_WARNING, "Non-numeric return value from count() method");
124124
zval_ptr_dtor(&php_value);
125125
return 0;
126126
}
@@ -137,15 +137,15 @@ static int v8js_array_access_get_count_result(zend_object *object TSRMLS_DC) /*
137137
}
138138
/* }}} */
139139

140-
static bool v8js_array_access_isset_p(zend_object *object, int index TSRMLS_DC) /* {{{ */
140+
static bool v8js_array_access_isset_p(zend_object *object, int index) /* {{{ */
141141
{
142142
zval zvalue;
143143
ZVAL_UNDEF(&zvalue);
144144

145-
zval php_value = v8js_array_access_dispatch(object, "offsetExists", 1, index, zvalue TSRMLS_CC);
145+
zval php_value = v8js_array_access_dispatch(object, "offsetExists", 1, index, zvalue);
146146

147147
if(Z_TYPE(php_value) != IS_TRUE && Z_TYPE(php_value) != IS_FALSE) {
148-
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Non-boolean return value from offsetExists() method");
148+
php_error_docref(NULL, E_WARNING, "Non-boolean return value from offsetExists() method");
149149
zval_ptr_dtor(&php_value);
150150
return false;
151151
}
@@ -164,7 +164,7 @@ static void v8js_array_access_length(v8::Local<v8::String> property, const v8::P
164164

165165
zend_object *object = reinterpret_cast<zend_object *>(self->GetAlignedPointerFromInternalField(1));
166166

167-
int length = v8js_array_access_get_count_result(object TSRMLS_CC);
167+
int length = v8js_array_access_get_count_result(object);
168168
info.GetReturnValue().Set(V8JS_INT(length));
169169
}
170170
/* }}} */
@@ -181,7 +181,7 @@ void v8js_array_access_deleter(uint32_t index, const v8::PropertyCallbackInfo<v8
181181
zval zvalue;
182182
ZVAL_UNDEF(&zvalue);
183183

184-
zval php_value = v8js_array_access_dispatch(object, "offsetUnset", 1, index, zvalue TSRMLS_CC);
184+
zval php_value = v8js_array_access_dispatch(object, "offsetUnset", 1, index, zvalue);
185185
zval_ptr_dtor(&php_value);
186186

187187
info.GetReturnValue().Set(V8JS_BOOL(true));
@@ -199,7 +199,7 @@ void v8js_array_access_query(uint32_t index, const v8::PropertyCallbackInfo<v8::
199199

200200
/* If index is set, then return an integer encoding a v8::PropertyAttribute;
201201
* otherwise we're expected to return an empty handle. */
202-
if(v8js_array_access_isset_p(object, index TSRMLS_CC)) {
202+
if(v8js_array_access_isset_p(object, index)) {
203203
info.GetReturnValue().Set(V8JS_UINT(v8::PropertyAttribute::None));
204204
}
205205
}
@@ -215,13 +215,13 @@ void v8js_array_access_enumerator(const v8::PropertyCallbackInfo<v8::Array>& inf
215215

216216
zend_object *object = reinterpret_cast<zend_object *>(self->GetAlignedPointerFromInternalField(1));
217217

218-
int length = v8js_array_access_get_count_result(object TSRMLS_CC);
218+
int length = v8js_array_access_get_count_result(object);
219219
v8::Local<v8::Array> result = v8::Array::New(isolate, length);
220220

221221
int i = 0;
222222

223223
for(int j = 0; j < length; j ++) {
224-
if(v8js_array_access_isset_p(object, j TSRMLS_CC)) {
224+
if(v8js_array_access_isset_p(object, j)) {
225225
result->Set(i ++, V8JS_INT(j));
226226
}
227227
}

0 commit comments

Comments
 (0)