cvs: php4 /ext/rpc rpc.c rpc_proxy.c /ext/rpc/com variant.c

phanto Sat Jan 11 03:59:37 2003 EDT Modified files: /php4/ext/rpc rpc.c rpc_proxy.c /php4/ext/rpc/com variant.c Log: fix build Index: php4/ext/rpc/rpc.c diff -u php4/ext/rpc/rpc.c:1.15 php4/ext/rpc/rpc.c:1.16 --- php4/ext/rpc/rpc.c:1.15 Tue Dec 31 11:07:22 2002 +++ php4/ext/rpc/rpc.c Sat Jan 11 03:59:36 2003 @@ -66,8 +66,6 @@ NULL, rpc_get, rpc_set, - NULL, - NULL, rpc_has_property, rpc_unset_property, rpc_get_properties, @@ -139,6 +137,24 @@ zend_llist_init(classes_list, sizeof(rpc_class_hash **), rpc_class_dtor, TRUE); FOREACH_HANDLER { + /* + handle = DL_LOAD(path); + if (!handle) { +#ifndef ZEND_WIN32 + fprintf(stderr, "Failed loading %s: %s\n", path, DL_ERROR()); +#else + fprintf(stderr, "Failed loading %s\n", path); +#endif + return FAILURE; + } + + extension_version_info = (zend_extension_version_info *) DL_FETCH_SYMBOL(handle, "extension_version_info"); + new_extension = (zend_extension *) DL_FETCH_SYMBOL(handle, "zend_extension_entry"); + if (!extension_version_info || !new_extension) { + fprintf(stderr, "%s doesn't appear to be a valid Zend extension\n", path); + return FAILURE; + } +*/ zend_class_entry ce; HANDLER.rpc_handler_init(module_number TSRMLS_CC); @@ -155,7 +171,7 @@ /* register classes and functions */ *HANDLER.ce = zend_register_internal_class_ex(&ce, rpc_entry, NULL TSRMLS_CC); - zend_register_functions(HANDLER.functions, NULL, MODULE_PERSISTENT TSRMLS_CC); + zend_register_functions(NULLHANDLER.functions, NULL, MODULE_PERSISTENT TSRMLS_CC); zend_register_ini_entries(HANDLER.ini, module_number TSRMLS_CC); } Index: php4/ext/rpc/rpc_proxy.c diff -u php4/ext/rpc/rpc_proxy.c:1.5 php4/ext/rpc/rpc_proxy.c:1.6 --- php4/ext/rpc/rpc_proxy.c:1.5 Tue Dec 31 11:07:22 2002 +++ php4/ext/rpc/rpc_proxy.c Sat Jan 11 03:59:36 2003 @@ -52,8 +52,6 @@ NULL, rpc_proxy_get, rpc_proxy_set, - NULL, - NULL, rpc_proxy_has_property, rpc_proxy_unset_property, rpc_proxy_get_properties, Index: php4/ext/rpc/com/variant.c diff -u php4/ext/rpc/com/variant.c:1.34 php4/ext/rpc/com/variant.c:1.35 --- php4/ext/rpc/com/variant.c:1.34 Tue Dec 31 11:07:23 2002 +++ php4/ext/rpc/com/variant.c Sat Jan 11 03:59:36 2003 @@ -62,8 +62,6 @@ NULL, NULL, NULL, - NULL, - NULL, variant_get_constructor, variant_get_class_entry, NULL,