--- xmlrpc-c-1.04/src/xmlrpc_libxml2.c.builderr	2005-12-12 10:05:46.000000000 +0100
+++ xmlrpc-c-1.04/src/xmlrpc_libxml2.c	2005-12-12 10:11:57.000000000 +0100
@@ -147,7 +147,7 @@
 **  documentation on each function works.
 */
 
-char *xml_element_name (xml_element *elem)
+char const *xml_element_name (xml_element const * const elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return elem->_name;
@@ -167,13 +167,13 @@
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
 }
 
-size_t xml_element_children_size (xml_element *elem)
+size_t xml_element_children_size (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
 }
 
-xml_element **xml_element_children (xml_element *elem)
+xml_element **xml_element_children (xml_element const *elem)
 {
     XMLRPC_ASSERT_ELEM_OK(elem);
     return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
@@ -410,13 +410,13 @@
     XMLRPC_ASSERT(context.root != NULL);
     XMLRPC_ASSERT(context.current == NULL);
 
-    *resultP = context.root;
+    *resultPP = context.root;
 
  cleanup:
     if (parser)
         xmlFreeParserCtxt(parser);
 
-    if (env->fault_occurred) {
+    if (envP->fault_occurred) {
         if (context.root)
             xml_element_free(context.root);
     }