gistfile1.txt

--- a/base/src/configurator.c   2015-02-05 22:21:37.000000000 +0100
+++ b/base/src/configurator.c   2015-02-09 12:42:29.524780027 +0100
@@ -571,16 +571,16 @@
        snode = xmlDocGetRootElement(second->xmldata);

        /* Get first subtree */
-       xmlBufPtr fbuf = calloc(1, 2000);
+       xmlBufferPtr fbuf = calloc(1, 2000);
        CHECK_ALLOC(fbuf, 1);
-       xmlBufGetNodeContent(fbuf, fnode);
-       const char *fcontent = (const char *) xmlBufContent(fbuf);
+       xmlNodeBufGetContent(fbuf, fnode);
+       const char *fcontent = (const char *) xmlBufferContent(fbuf);

        /* Get second subtree */
-       xmlBufPtr sbuf = calloc(1, 2000);
+       xmlBufferPtr sbuf = calloc(1, 2000);
        CHECK_ALLOC(sbuf, 1);
-       xmlBufGetNodeContent(sbuf, snode);
-       const char *scontent = (const char *) xmlBufContent(sbuf);
+       xmlNodeBufGetContent(sbuf, snode);
+       const char *scontent = (const char *) xmlBufferContent(sbuf);

        /* Compare contents of subtrees */
        int ret = 0;