diff options
author | Daniel Veillard <veillard@redhat.com> | 2012-08-09 14:02:33 -0400 |
---|---|---|
committer | Rob Richards <rrichards@php.net> | 2012-08-09 14:02:33 -0400 |
commit | c4b26cc1b0b0521c75e653fffec2a9e3b4bf8cbb (patch) | |
tree | ebc299e5dc089d08be5a1a6a85451bf3cbd8d712 /ext/dom/node.c | |
parent | ed793b2a3f857fd49c0c1b036062140da5b3e674 (diff) | |
download | php-git-c4b26cc1b0b0521c75e653fffec2a9e3b4bf8cbb.tar.gz |
Update to work with libxml 2.9.0
Diffstat (limited to 'ext/dom/node.c')
-rw-r--r-- | ext/dom/node.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/dom/node.c b/ext/dom/node.c index 5bcb234762..727d1bcef3 100644 --- a/ext/dom/node.c +++ b/ext/dom/node.c @@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ RETVAL_FALSE; } else { if (mode == 0) { +#ifdef LIBXML2_NEW_BUFFER + ret = xmlOutputBufferGetSize(buf); +#else ret = buf->buffer->use; +#endif if (ret > 0) { +#ifdef LIBXML2_NEW_BUFFER + RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1); +#else RETVAL_STRINGL((char *) buf->buffer->content, ret, 1); +#endif } else { RETVAL_EMPTY_STRING(); } |