Skip to content

Commit 8668d28

Browse files
committed
Remove V8JS_CONST preprocessor define
1 parent c459acd commit 8668d28

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

php_v8js_macros.h

-8
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,6 @@ extern "C" {
6666
#define V8JS_GET_CLASS_NAME(var, obj) \
6767
v8::String::Utf8Value var(obj->GetConstructorName());
6868

69-
/* method signatures of zend_update_property and zend_read_property were
70-
* declared as 'char *' instead of 'const char *' before PHP 5.4 */
71-
#if ZEND_MODULE_API_NO >= 20100525
72-
# define V8JS_CONST
73-
#else
74-
# define V8JS_CONST (char *)
75-
#endif
76-
7769
/* Options */
7870
#define V8JS_FLAG_NONE (1<<0)
7971
#define V8JS_FLAG_FORCE_ARRAY (1<<1)

v8js_object_export.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
621621
if(!property_info ||
622622
(property_info != ZEND_WRONG_PROPERTY_INFO &&
623623
property_info->flags & ZEND_ACC_PUBLIC)) {
624-
zval *property_val = zend_read_property(NULL, &zobject, V8JS_CONST name, name_len, true, &php_value TSRMLS_CC);
624+
zval *property_val = zend_read_property(NULL, &zobject, name, name_len, true, &php_value TSRMLS_CC);
625625
// special case uninitialized_zval_ptr and return an empty value
626626
// (indicating that we don't intercept this property) if the
627627
// property doesn't exist.
@@ -656,7 +656,7 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
656656
if(!property_info ||
657657
(property_info != ZEND_WRONG_PROPERTY_INFO &&
658658
property_info->flags & ZEND_ACC_PUBLIC)) {
659-
zend_update_property(scope, &zobject, V8JS_CONST name, name_len, &php_value TSRMLS_CC);
659+
zend_update_property(scope, &zobject, name, name_len, &php_value TSRMLS_CC);
660660
ret_value = set_value;
661661
}
662662
else if (ce->__set

0 commit comments

Comments
 (0)