diff --git a/v8js.cc b/v8js.cc index f1d0621..6350d6d 100644 --- a/v8js.cc +++ b/v8js.cc @@ -1539,11 +1539,6 @@ static PHP_MINIT_FUNCTION(v8js) { zend_class_entry ce; -#ifdef ZTS - std::mutex mutex; - memcpy(&V8JSG(timer_mutex), &mutex, sizeof(V8JSG(timer_mutex))); -#endif - /* V8Object Class */ INIT_CLASS_ENTRY(ce, "V8Object", NULL); php_ce_v8_object = zend_register_internal_class(&ce TSRMLS_CC); @@ -1675,6 +1670,7 @@ static PHP_MINFO_FUNCTION(v8js) */ static PHP_GINIT_FUNCTION(v8js) { +#ifdef ZTS v8js_globals->extensions = NULL; v8js_globals->v8_initialized = 0; v8js_globals->v8_flags = NULL; @@ -1683,6 +1679,7 @@ static PHP_GINIT_FUNCTION(v8js) new(&v8js_globals->timer_mutex) std::mutex; new(&v8js_globals->timer_stack) std::stack; new(&v8js_globals->modules_loaded) std::map>; +#endif } /* }}} */ @@ -1701,7 +1698,7 @@ static PHP_GSHUTDOWN_FUNCTION(v8js) v8js_globals->v8_flags = NULL; } -#if 0 +#ifdef ZTS v8js_globals->timer_stack.~stack(); v8js_globals->timer_mutex.~mutex(); v8js_globals->modules_loaded.~map();