diff -ru php-5.3.0RC2/ext/xsl/php_xsl.c ../php-5.3.0RC2/ext/xsl/php_xsl.c --- php-5.3.0RC2/ext/xsl/php_xsl.c 2008-12-31 12:15:47.000000000 +0100 +++ ../php-5.3.0RC2/ext/xsl/php_xsl.c 2009-05-09 22:01:53.000000000 +0200 @@ -206,47 +206,6 @@ } /* }}} */ -/* {{{ php_xsl_create_object */ -zval *php_xsl_create_object(xsltStylesheetPtr obj, int *found, zval *wrapper_in, zval *return_value TSRMLS_DC) -{ - zval *wrapper; - zend_class_entry *ce; - - *found = 0; - - if (!obj) { - if(!wrapper_in) { - ALLOC_ZVAL(wrapper); - } else { - wrapper = wrapper_in; - } - ZVAL_NULL(wrapper); - return wrapper; - } - - if ((wrapper = (zval *) xsl_object_get_data((void *) obj))) { - zval_add_ref(&wrapper); - *found = 1; - return wrapper; - } - - if(!wrapper_in) { - wrapper = return_value; - } else { - wrapper = wrapper_in; - } - - - ce = xsl_xsltprocessor_class_entry; - - if(!wrapper_in) { - object_init_ex(wrapper, ce); - } - php_xsl_set_object(wrapper, (void *) obj TSRMLS_CC); - return (wrapper); -} -/* }}} */ - /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(xsl) diff -ru php-5.3.0RC2/ext/xsl/php_xsl.h ../php-5.3.0RC2/ext/xsl/php_xsl.h --- php-5.3.0RC2/ext/xsl/php_xsl.h 2008-12-31 12:15:47.000000000 +0100 +++ ../php-5.3.0RC2/ext/xsl/php_xsl.h 2009-05-09 22:01:36.000000000 +0200 @@ -69,13 +69,6 @@ ce.create_object = xsl_objects_new; \ entry = zend_register_internal_class_ex(&ce, parent_ce, NULL TSRMLS_CC); -#define XSL_DOMOBJ_NEW(zval, obj, ret) \ - if (NULL == (zval = php_xsl_create_object(obj, ret, zval, return_value TSRMLS_CC))) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \ - RETURN_FALSE; \ - } - - PHP_MINIT_FUNCTION(xsl); PHP_MSHUTDOWN_FUNCTION(xsl);