diff options
Diffstat (limited to 'ext/dom/xml_common.h')
| -rw-r--r-- | ext/dom/xml_common.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h index b6998afd2..8f93ed7ec 100644 --- a/ext/dom/xml_common.h +++ b/ext/dom/xml_common.h @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml_common.h 306939 2011-01-01 02:19:59Z felipe $ */ +/* $Id: xml_common.h 314493 2011-08-08 12:29:32Z iliaa $ */ #ifndef PHP_XML_COMMON_H #define PHP_XML_COMMON_H @@ -78,12 +78,14 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); } \ } -#define DOM_RET_OBJ(zval, obj, ret, domobject) \ - if (NULL == (zval = php_dom_create_object(obj, ret, zval, return_value, domobject TSRMLS_CC))) { \ +#define DOM_RET_OBJ_EX(obj, ret, domobject) \ + if (!php_dom_create_object(obj, ret, NULL, 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())) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \ |