jan Sun Feb 15 06:32:28 2004 EDT
Modified files:
/php-src/ext/mono php_mono.c
Log:
- fix build (patch by josh at mediascape dot com)
- close #26045
http://cvs.php.net/diff.php/php-src/ext/mono/php_mono.c?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/mono/php_mono.c
diff -u php-src/ext/mono/php_mono.c:1.13 php-src/ext/mono/php_mono.c:1.14
--- php-src/ext/mono/php_mono.c:1.13 Wed Feb 4 06:14:32 2004
+++ php-src/ext/mono/php_mono.c Sun Feb 15 06:32:26 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mono.c,v 1.13 2004/02/04 11:14:32 zeev Exp $ */
+/* $Id: php_mono.c,v 1.14 2004/02/15 11:32:26 jan Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -170,7 +170,7 @@
}
static zval *
-property_read(zval *object, zval *member TSRMLS_DC)
+property_read(zval *object, zval *member, zend_bool silent TSRMLS_DC)
{
zval *rv;
php_mono_object *pm;
@@ -664,7 +664,9 @@
f = emalloc(sizeof(zend_internal_function));
f->type = ZEND_OVERLOADED_FUNCTION;
- f->arg_types = NULL;
+ f->arg_info = NULL;
+ f->num_args = 0;
+ f->pass_rest_by_reference = 0;
f->scope = pm->zo.ce;
f->fn_flags = 0;
f->function_name = estrndup(method_name, method_len);
@@ -697,7 +699,7 @@
zval *property;
property_ptr = emalloc(sizeof(zval **));
- property = property_read(object, member TSRMLS_CC);
+ property = property_read(object, member, 0 TSRMLS_CC);
zval_add_ref(&property);
*property_ptr = property;
@@ -739,12 +741,16 @@
ZEND_OBJECTS_STORE_HANDLERS,
property_read,
property_write,
+ NULL,
+ NULL,
property_get_ptr,
NULL,
NULL,
property_exists,
property_delete,
NULL,
+ NULL,
+ NULL,
method_get,
call_method,
constructor_get,
@@ -1038,7 +1044,9 @@
constructor.type = ZEND_INTERNAL_FUNCTION;
constructor.function_name = "mono";
constructor.scope = mono_class_entry;
- constructor.arg_types = NULL;
+ constructor.arg_info = NULL;
+ constructor.num_args = 0;
+ constructor.pass_rest_by_reference = 0;
constructor.handler = ZEND_FN(mono_load);
zend_hash_add(&mono_class_entry->function_table, "mono",
@@ -1051,7 +1059,9 @@
method_call.type = ZEND_INTERNAL_FUNCTION;
method_call.function_name = "call";
method_call.scope = mono_method_class_entry;
- method_call.arg_types = NULL;
+ method_call.arg_info = NULL;
+ method_call.num_args = 0;
+ method_call.pass_rest_by_reference = 0;
method_call.handler = ZEND_FN(mono_method_call);
zend_hash_add(&mono_method_class_entry->function_table, "call",
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
