mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2025-03-22 04:37:01 +00:00
Code Releases Activity

Remove V8JS_CONST preprocessor define

Browse Source
This commit is contained in:
Stefan Siegl 2016-07-02 23:02:17 +02:00
parent c459acd1ef
commit 8668d28df3
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
php_v8js_macros.h
View File

@ -66,14 +66,6 @@ extern "C" {
#define V8JS_GET_CLASS_NAME(var, obj) \ #define V8JS_GET_CLASS_NAME(var, obj) \
v8::String::Utf8Value var(obj->GetConstructorName()); v8::String::Utf8Value var(obj->GetConstructorName());
/* method signatures of zend_update_property and zend_read_property were
* declared as 'char *' instead of 'const char *' before PHP 5.4 */
#if ZEND_MODULE_API_NO >= 20100525
# define V8JS_CONST
#else
# define V8JS_CONST (char *)
#endif
/* Options */ /* Options */
#define V8JS_FLAG_NONE (1<<0) #define V8JS_FLAG_NONE (1<<0)
#define V8JS_FLAG_FORCE_ARRAY (1<<1) #define V8JS_FLAG_FORCE_ARRAY (1<<1)

4
v8js_object_export.cc
View File

@ -621,7 +621,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
if(!property_info || if(!property_info ||
(property_info != ZEND_WRONG_PROPERTY_INFO && (property_info != ZEND_WRONG_PROPERTY_INFO &&
property_info->flags & ZEND_ACC_PUBLIC)) { property_info->flags & ZEND_ACC_PUBLIC)) {
zval *property_val = zend_read_property(NULL, &zobject, V8JS_CONST name, name_len, true, &php_value TSRMLS_CC); zval *property_val = zend_read_property(NULL, &zobject, name, name_len, true, &php_value TSRMLS_CC);
// special case uninitialized_zval_ptr and return an empty value // special case uninitialized_zval_ptr and return an empty value
// (indicating that we don't intercept this property) if the // (indicating that we don't intercept this property) if the
// property doesn't exist. // property doesn't exist.
@ -656,7 +656,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
if(!property_info || if(!property_info ||
(property_info != ZEND_WRONG_PROPERTY_INFO && (property_info != ZEND_WRONG_PROPERTY_INFO &&
property_info->flags & ZEND_ACC_PUBLIC)) { property_info->flags & ZEND_ACC_PUBLIC)) {
zend_update_property(scope, &zobject, V8JS_CONST name, name_len, &php_value TSRMLS_CC); zend_update_property(scope, &zobject, name, name_len, &php_value TSRMLS_CC);
ret_value = set_value; ret_value = set_value;
} }
else if (ce->__set else if (ce->__set