Skip to content

Commit 745126b

Browse files
committed
remove left-over TSRM stuff
1 parent 3e8ef5f commit 745126b

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

v8js_class.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ static PHP_METHOD(V8Js, __construct)
344344
}
345345

346346
/* Initialize V8 */
347-
v8js_v8_init(TSRMLS_C);
347+
v8js_v8_init();
348348

349349
/* Throw PHP exception if uncaught exceptions exist */
350350
c->report_uncaught = report_uncaught;
@@ -1130,7 +1130,7 @@ static PHP_METHOD(V8Js, createSnapshot)
11301130
}
11311131

11321132
/* Initialize V8, if not already done. */
1133-
v8js_v8_init(TSRMLS_C);
1133+
v8js_v8_init();
11341134

11351135
v8::StartupData snapshot_blob = v8::V8::CreateSnapshotDataBlob(ZSTR_VAL(script));
11361136

@@ -1320,10 +1320,10 @@ PHP_MINIT_FUNCTION(v8js_class) /* {{{ */
13201320
v8js_object_handlers.unset_property = v8js_unset_property;
13211321

13221322
/* V8Js Class Constants */
1323-
zend_declare_class_constant_string(php_ce_v8js, ZEND_STRL("V8_VERSION"), PHP_V8_VERSION TSRMLS_CC);
1323+
zend_declare_class_constant_string(php_ce_v8js, ZEND_STRL("V8_VERSION"), PHP_V8_VERSION);
13241324

1325-
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_NONE"), V8JS_FLAG_NONE TSRMLS_CC);
1326-
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_FORCE_ARRAY"), V8JS_FLAG_FORCE_ARRAY TSRMLS_CC);
1325+
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_NONE"), V8JS_FLAG_NONE);
1326+
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_FORCE_ARRAY"), V8JS_FLAG_FORCE_ARRAY);
13271327
zend_declare_class_constant_long(php_ce_v8js, ZEND_STRL("FLAG_PROPAGATE_PHP_EXCEPTIONS"), V8JS_FLAG_PROPAGATE_PHP_EXCEPTIONS);
13281328

13291329
le_v8js_script = zend_register_list_destructors_ex(v8js_script_dtor, NULL, PHP_V8JS_SCRIPT_RES_NAME, module_number);

v8js_exceptions.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void v8js_create_script_exception(zval *return_value, v8::Isolate *isolate, v8::
8484
if(try_catch->Exception()->IsObject() && try_catch->Exception()->ToObject()->InternalFieldCount() == 2) {
8585
zend_object *php_exception = reinterpret_cast<zend_object *>(try_catch->Exception()->ToObject()->GetAlignedPointerFromInternalField(1));
8686

87-
zend_class_entry *exception_ce = zend_exception_get_default(TSRMLS_C);
87+
zend_class_entry *exception_ce = zend_exception_get_default();
8888
if (instanceof_function(php_exception->ce, exception_ce)) {
8989
++GC_REFCOUNT(php_exception);
9090
zend_exception_set_previous(Z_OBJ_P(return_value), php_exception);

v8js_methods.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ V8JS_METHOD(require)
268268
// Check if an exception was thrown
269269
if (EG(exception)) {
270270
// Clear the PHP exception and throw it in V8 instead
271-
zend_clear_exception(TSRMLS_C);
271+
zend_clear_exception();
272272
info.GetReturnValue().Set(isolate->ThrowException(V8JS_SYM("Module normaliser callback exception")));
273273
return;
274274
}
@@ -390,7 +390,7 @@ V8JS_METHOD(require)
390390
efree(normalised_path);
391391

392392
// Clear the PHP exception and throw it in V8 instead
393-
zend_clear_exception(TSRMLS_C);
393+
zend_clear_exception();
394394
info.GetReturnValue().Set(isolate->ThrowException(V8JS_SYM("Module loader callback exception")));
395395
return;
396396
}

v8js_object_export.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, v
167167
zval tmp_zv;
168168
ZVAL_OBJ(&tmp_zv, EG(exception));
169169
return_value = isolate->ThrowException(zval_to_v8js(&tmp_zv, isolate));
170-
zend_clear_exception(TSRMLS_C);
170+
zend_clear_exception();
171171
} else {
172172
v8js_terminate_execution(isolate);
173173
}

v8js_v8.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extern "C" {
3232
#include <libplatform/libplatform.h>
3333

3434

35-
void v8js_v8_init(TSRMLS_D) /* {{{ */
35+
void v8js_v8_init() /* {{{ */
3636
{
3737
/* Run only once; thread-local test first */
3838
if (V8JSG(v8_initialized)) {

v8js_v8.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static inline const char * ToCString(const v8::String::Utf8Value &value) /* {{{
5151

5252

5353

54-
void v8js_v8_init(TSRMLS_D);
54+
void v8js_v8_init();
5555
void v8js_v8_call(v8js_ctx *c, zval **return_value,
5656
long flags, long time_limit, long memory_limit,
5757
std::function< v8::Local<v8::Value>(v8::Isolate *) >& v8_call);

0 commit comments

Comments
 (0)