From 55bc3d863c744e3628e426325802337bdb2a6812 Mon Sep 17 00:00:00 2001 From: Richard Boulton Date: Fri, 2 Mar 2001 17:03:20 +0000 Subject: [PATCH] Include compatability defines for libxml: use xmlChildrenNode instead of childs. Original commit message from CVS: Include compatability defines for libxml: use xmlChildrenNode instead of childs. --- test/xml/readreg.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/xml/readreg.c b/test/xml/readreg.c index 8db054b32e..300a07ce6c 100644 --- a/test/xml/readreg.c +++ b/test/xml/readreg.c @@ -2,6 +2,13 @@ #include #include +// Include compatability defines: if libxml hasn't already defined these, +// we have an old version 1.x +#ifndef xmlChildrenNode +#define xmlChildrenNode childs +#define xmlRootNode root +#endif + typedef struct _GstRegistryPlugin GstRegistryPlugin; typedef struct _GstRegistryElement GstRegistryElement; @@ -17,7 +24,7 @@ struct _GstRegistryElement { }; gchar *getcontents(xmlDocPtr doc,xmlNodePtr cur) { - return g_strdup(xmlNodeListGetString(doc,cur->childs,1)); + return g_strdup(xmlNodeListGetString(doc,cur->xmlChildrenNode,1)); } int main(int argc,char *argv[]) { @@ -51,10 +58,10 @@ int main(int argc,char *argv[]) { exit(1); } - cur = cur->childs; /* 'childs'??? He (Daniel) is Dutch, so... */ + cur = cur->xmlChildrenNode; while (cur != NULL) { if (!strcmp(cur->name,"plugin")) { - xmlNodePtr field = cur->childs; + xmlNodePtr field = cur->xmlChildrenNode; GstRegistryPlugin *plugin = g_new0(GstRegistryPlugin,1); while (field) { @@ -67,7 +74,7 @@ int main(int argc,char *argv[]) { g_print("new plugin '%s' at '%s'\n",plugin->name,plugin->filename); plugins = g_slist_prepend(plugins,plugin); } else if (!strcmp(cur->name,"element")) { - xmlNodePtr field = cur->childs; + xmlNodePtr field = cur->xmlChildrenNode; GstRegistryElement *element = g_new0(GstRegistryElement,1); while (field) {