com gtk/php-gtk: Object property stuff updated: ext/gtk+/gdk.overrides main/phpg_closure.c main/phpg_support.c

[David Soria Parra]

Commit: bda3f0b5efda77d6b99815957289ba41907c0b71
Author: Mark Skilbeck <***@php.net> Tue, 1 Jun 2010 22:09:34 +0000
Parents: f273ac581207d096f3f5759cd740657762ccd621
Branches: master

Link: http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=bda3f0b5efda77d6b99815957289ba41907c0b71

Log:
Object property stuff updated

Changed paths:
M ext/gtk+/gdk.overrides
M main/phpg_closure.c
M main/phpg_support.c


Diff:
bda3f0b5efda77d6b99815957289ba41907c0b71
diff --git a/ext/gtk+/gdk.overrides b/ext/gtk+/gdk.overrides
index 6ae23b6..d31ca5e 100644
--- a/ext/gtk+/gdk.overrides
+++ b/ext/gtk+/gdk.overrides
@@ -1162,7 +1162,11 @@ static zval* phpg_gdkevent_read_property_handler(zval *object, zval *member, int
Z_SET_REFCOUNT_P(result, 0);
Z_UNSET_ISREF_P(result);
} else {
- result = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ #if PHP_VERSION_ID < 50399
+ result = zend_get_std_object_handlers()->read_property(object, member, type, TSRMLS_CC);
+ #else
+ result = zend_get_std_object_handlers()->read_property(object, member, type, NULL TSRMLS_CC);
+ #endif
}

if (member == &tmp_member) {
diff --git a/main/phpg_closure.c b/main/phpg_closure.c
index 51b8989..89d0b89 100644
--- a/main/phpg_closure.c
+++ b/main/phpg_closure.c
@@ -243,7 +243,11 @@ static void phpg_signal_class_closure_marshal(GClosure *closure,
g_free(lc_method_name);

if (Z_OBJ_HT_P(php_object)->get_method != NULL
+ #if PHP_VERSION_ID < 50399
&& (func = Z_OBJ_HT_P(php_object)->get_method(&php_object, method_name, method_name_len TSRMLS_CC)) != NULL) {
+ #else
+ && (func = Z_OBJ_HT_P(php_object)->get_method(&php_object, method_name, method_name_len, NULL TSRMLS_CC)) != NULL) {
+ #endif
if (func->type == ZEND_INTERNAL_FUNCTION
&& ((zend_internal_function*)func)->handler == zend_std_call_user_call
) {
diff --git a/main/phpg_support.c b/main/phpg_support.c
index 11aa631..e7cc2f5 100644
--- a/main/phpg_support.c
+++ b/main/phpg_support.c
@@ -63,7 +63,11 @@ zval* phpg_read_property(zval *object, zval *member, int type TSRMLS_DC)
result_ptr = EG(uninitialized_zval_ptr);
}
} else {
+ #if PHP_VERSION_ID < 50399
result_ptr = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+ #else
+ result_ptr = zend_get_std_object_handlers()->read_property(object, member, type, NULL TSRMLS_CC);
+ #endif
}

if (member == &tmp_member) {
@@ -102,7 +106,11 @@ void phpg_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
php_error(E_NOTICE, "PHP-GTK: ignoring write attempt to the read only property");
}
} else {
+ #if PHP_VERSION_ID < 50399
zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+ #else
+ zend_get_std_object_handlers()->write_property(object, member, value, NULL TSRMLS_CC);
+ #endif
}

if (member == &tmp_member) {
@@ -144,7 +152,11 @@ zval **phpg_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC)
*/
result = NULL;
} else {
- result = zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+ #if PHP_VERSION_ID < 50399
+ result = zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+ #else
+ result = zend_get_std_object_handlers()->get_property_ptr_ptr(object, member, NULL TSRMLS_CC);
+ #endif
}

if (member == &tmp_member) {