|
@@ -52,12 +52,20 @@ void v8js_v8_init() /* {{{ */
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#if defined(PHP_V8_NATIVES_BLOB_PATH) && defined(PHP_V8_SNAPSHOT_BLOB_PATH)
|
|
|
|
|
|
+
|
|
|
|
+#if defined(PHP_V8_SNAPSHOT_BLOB_PATH)
|
|
|
|
+#if !defined(PHP_V8_NATIVES_BLOB_PATH)
|
|
|
|
+ /* Newer V8 version don't have a natives blob anymore. */
|
|
|
|
+ v8::V8::InitializeExternalStartupDataFromFile(
|
|
|
|
+ PHP_V8_SNAPSHOT_BLOB_PATH
|
|
|
|
+ );
|
|
|
|
+#else
|
|
/* V8 doesn't work without startup data, load it. */
|
|
/* V8 doesn't work without startup data, load it. */
|
|
v8::V8::InitializeExternalStartupData(
|
|
v8::V8::InitializeExternalStartupData(
|
|
PHP_V8_NATIVES_BLOB_PATH,
|
|
PHP_V8_NATIVES_BLOB_PATH,
|
|
PHP_V8_SNAPSHOT_BLOB_PATH
|
|
PHP_V8_SNAPSHOT_BLOB_PATH
|
|
);
|
|
);
|
|
|
|
+#endif
|
|
#endif
|
|
#endif
|
|
|
|
|
|
v8js_process_globals.v8_platform = v8::platform::NewDefaultPlatform();
|
|
v8js_process_globals.v8_platform = v8::platform::NewDefaultPlatform();
|