diff --git a/php_v8js_macros.h b/php_v8js_macros.h index 9461453..2318d81 100644 --- a/php_v8js_macros.h +++ b/php_v8js_macros.h @@ -66,14 +66,6 @@ extern "C" { #define V8JS_GET_CLASS_NAME(var, obj) \ 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 */ #define V8JS_FLAG_NONE (1<<0) #define V8JS_FLAG_FORCE_ARRAY (1<<1) diff --git a/v8js_object_export.cc b/v8js_object_export.cc index 17fa11a..6e0b55c 100644 --- a/v8js_object_export.cc +++ b/v8js_object_export.cc @@ -621,7 +621,7 @@ v8::Local v8js_named_property_callback(v8::Local property if(!property_info || (property_info != ZEND_WRONG_PROPERTY_INFO && 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 // (indicating that we don't intercept this property) if the // property doesn't exist. @@ -656,7 +656,7 @@ v8::Local v8js_named_property_callback(v8::Local property if(!property_info || (property_info != ZEND_WRONG_PROPERTY_INFO && 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; } else if (ce->__set