svn: /gtk/php-gtk/trunk/ ext/gtk+/gdk.overrides main/phpg_closure.c main/phpg_support.c

[Mark Skilbeck]

markskilbeck Tue, 01 Jun 2010 22:09:34 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300079

Log:
Object property stuff updated

Changed paths:
U gtk/php-gtk/trunk/ext/gtk+/gdk.overrides
U gtk/php-gtk/trunk/main/phpg_closure.c
U gtk/php-gtk/trunk/main/phpg_support.c

Modified: gtk/php-gtk/trunk/ext/gtk+/gdk.overrides
===================================================================
--- gtk/php-gtk/trunk/ext/gtk+/gdk.overrides 2010-06-01 21:51:50 UTC (rev 300078)
+++ gtk/php-gtk/trunk/ext/gtk+/gdk.overrides 2010-06-01 22:09:34 UTC (rev 300079)
@@ -1162,7 +1162,11 @@
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) {

Modified: gtk/php-gtk/trunk/main/phpg_closure.c
===================================================================
--- gtk/php-gtk/trunk/main/phpg_closure.c 2010-06-01 21:51:50 UTC (rev 300078)
+++ gtk/php-gtk/trunk/main/phpg_closure.c 2010-06-01 22:09:34 UTC (rev 300079)
@@ -243,7 +243,11 @@
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
) {

Modified: gtk/php-gtk/trunk/main/phpg_support.c
===================================================================
--- gtk/php-gtk/trunk/main/phpg_support.c 2010-06-01 21:51:50 UTC (rev 300078)
+++ gtk/php-gtk/trunk/main/phpg_support.c 2010-06-01 22:09:34 UTC (rev 300079)
@@ -63,7 +63,11 @@
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 @@
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 @@
*/
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) {