--- embedaddon/php/ext/dom/xml_common.h 2012/02/21 23:47:54 1.1 +++ embedaddon/php/ext/dom/xml_common.h 2013/07/22 01:31:40 1.1.1.3 @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2012 The PHP Group | + | Copyright (c) 1997-2013 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml_common.h,v 1.1 2012/02/21 23:47:54 misho Exp $ */ +/* $Id: xml_common.h,v 1.1.1.3 2013/07/22 01:31:40 misho Exp $ */ #ifndef PHP_XML_COMMON_H #define PHP_XML_COMMON_H @@ -54,7 +54,7 @@ typedef struct _dom_object { PHP_DOM_EXPORT extern zend_class_entry *dom_node_class_entry; PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj); -PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *in, zval* return_value, dom_object *domobj TSRMLS_DC); +PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval* return_value, dom_object *domobj TSRMLS_DC); PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); #define DOM_XMLNS_NAMESPACE \ @@ -78,13 +78,11 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_obje } \ } -#define DOM_RET_OBJ_EX(obj, ret, domobject) \ - if (!php_dom_create_object(obj, ret, NULL, return_value, domobject TSRMLS_CC)) { \ +#define DOM_RET_OBJ(obj, ret, domobject) \ + if (!php_dom_create_object(obj, ret, return_value, domobject TSRMLS_CC)) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \ RETURN_FALSE; \ } - -#define DOM_RET_OBJ(zval, obj, ret, domobject) DOM_RET_OBJ_EX(obj, ret, domobject) #define DOM_GET_THIS(zval) \ if (NULL == (zval = getThis())) { \