mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-11-09 16:28:41 +00:00
Code Releases Activity

Merge remote-tracking branch 'pecl/master'

Browse Source 
Merging form pecl/v8js master branch to preillyme/v8js on Github
to get both heads on par.

Conflicts:
	php_v8js_macros.h
This commit is contained in:
Stefan Siegl 2015-03-13 13:59:23 +01:00
commit 5fb79ee994
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php_v8js_macros.h
View File

@ -53,7 +53,7 @@ extern "C" {
#endif #endif
/* V8Js Version */ /* V8Js Version */
#define V8JS_VERSION "0.1.5" #define PHP_V8JS_VERSION "0.1.5"
/* Hidden field name used to link JS wrappers with underlying PHP object */ /* Hidden field name used to link JS wrappers with underlying PHP object */
#define PHPJS_OBJECT_KEY "phpjs::object" #define PHPJS_OBJECT_KEY "phpjs::object"

4
v8js.cc
View File

@ -155,7 +155,7 @@ static PHP_MINFO_FUNCTION(v8js)
php_info_print_table_header(2, "V8 Javascript Engine", "enabled"); php_info_print_table_header(2, "V8 Javascript Engine", "enabled");
php_info_print_table_header(2, "V8 Engine Compiled Version", PHP_V8_VERSION); php_info_print_table_header(2, "V8 Engine Compiled Version", PHP_V8_VERSION);
php_info_print_table_header(2, "V8 Engine Linked Version", v8::V8::GetVersion()); php_info_print_table_header(2, "V8 Engine Linked Version", v8::V8::GetVersion());
php_info_print_table_header(2, "Version", V8JS_VERSION); php_info_print_table_header(2, "Version", PHP_V8JS_VERSION);
php_info_print_table_end(); php_info_print_table_end();
DISPLAY_INI_ENTRIES(); DISPLAY_INI_ENTRIES();
@ -232,7 +232,7 @@ zend_module_entry v8js_module_entry = {
NULL, NULL,
PHP_RSHUTDOWN(v8js), PHP_RSHUTDOWN(v8js),
PHP_MINFO(v8js), PHP_MINFO(v8js),
V8JS_VERSION, PHP_V8JS_VERSION,
PHP_MODULE_GLOBALS(v8js), PHP_MODULE_GLOBALS(v8js),
PHP_GINIT(v8js), PHP_GINIT(v8js),
PHP_GSHUTDOWN(v8js), PHP_GSHUTDOWN(v8js),