op_array.opcode restructure patch
[email protected] (Mark Skilbeck) Tue, 25 May 2010 20:31:11 +0100
| Newsgroups | php.gtk.dev |
|---|---|
| Message-ID | <[email protected]> |
See: http://svn.php.net/viewvc?view=revision&revision=298203 The above revision adds an extra parameter (const struct _zend_literal *key) to the following function pointers: http://svn.php.net/viewvc/php/php-src/trunk/Zend/zend_object_handlers.h?r1=298203&r2=298202&pathrev=298203 -- Mark Skilbeck mahcuz.com | gtk.php.net | pecl.php.net/cairo | docs.php.net
r298203.patch.txt
(text/plain, 1.2 KB)
Index: main/phpg_closure.c
===================================================================
--- main/phpg_closure.c (revision 299748)
+++ main/phpg_closure.c (working copy)
@@ -243,7 +243,7 @@
g_free(lc_method_name);
if (Z_OBJ_HT_P(php_object)->get_method != NULL
- && (func = Z_OBJ_HT_P(php_object)->get_method(&php_object, method_name, method_name_len TSRMLS_CC)) != NULL) {
+ && (func = Z_OBJ_HT_P(php_object)->get_method(&php_object, method_name, method_name_len, NULL TSRMLS_CC)) != NULL) {
if (func->type == ZEND_INTERNAL_FUNCTION
&& ((zend_internal_function*)func)->handler == zend_std_call_user_call
) {
Index: ext/gtk+/gdk.overrides
===================================================================
--- ext/gtk+/gdk.overrides (revision 299748)
+++ ext/gtk+/gdk.overrides (working copy)
@@ -1162,7 +1162,7 @@
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);
+ result = zend_get_std_object_handlers()->read_property(object, member, type, NULL TSRMLS_CC);
}
if (member == &tmp_member) {