compilation failure with libxml 2.3.9 (fix inside)

[obecian <obecian openbsd org>]

dia 0.88.1 is still using the DATA typedef
libxml 2.3.9 does not...

patch follows

--- lib/plug-ins.c.orig	Fri Jun  1 02:01:37 2001
+++ lib/plug-ins.c	Fri Jun  1 02:01:50 2001
@@ -435,7 +435,7 @@ plugin_load_inhibited(const gchar *filen
 
   ensure_pluginrc();
   for (node = pluginrc->root->childs; node != NULL; node =
node->next) {
-    CHAR *node_filename;
     +    xmlChar *node_filename;
 
     if (node->type != XML_ELEMENT_NODE || strcmp(node->name,
"plugin") != 0)
       continue;
@@ -472,7 +472,7 @@ info_fill_from_pluginrc(PluginInfo *info
 
   ensure_pluginrc();
   for (node = pluginrc->root->childs; node != NULL; node =
node->next) {
-    CHAR *node_filename;
     +    xmlChar *node_filename;
 
     if (node->type != XML_ELEMENT_NODE || strcmp(node->name,
"plugin") != 0)
       continue;
@@ -524,7 +524,7 @@ dia_pluginrc_write(void)
       datanode = xmlNewChild(pluginnode, NULL, "inhibit-load", NULL);
 
     for (node = pluginrc->root->childs; node != NULL; node =
node->next) {
-      CHAR *node_filename;
       +      xmlChar *node_filename;
 
       if (node->type != XML_ELEMENT_NODE || strcmp(node->name,
"plugin") != 0)
 	continue;
--- objects/custom/shape_info.c.orig	Fri Jun  1 02:15:40 2001
+++ objects/custom/shape_info.c	Fri Jun  1 02:16:13 2001
@@ -501,7 +501,7 @@ static void
 parse_svg_node(ShapeInfo *info, xmlNodePtr node, xmlNsPtr svg_ns,
 	       GraphicStyle *style)
 {
-  CHAR *str;
   +  char *str;
   char *old_locale;
 
   /* walk SVG node ... */
@@ -868,7 +868,7 @@ load_shape_info(const gchar *filename)
       for (pt_node = node->childs; pt_node != NULL; pt_node =
pt_node->next) {
 	if (pt_node->ns == shape_ns && !strcmp(pt_node->name, "point")) {
 	  Point pt = { 0.0, 0.0 };
-	  CHAR *str;
 	  +	  char *str;
 
 	  str = xmlGetProp(pt_node, "x");
 	  if (str) {
@@ -891,7 +891,7 @@ load_shape_info(const gchar *filename)
       info->connections = (Point *)arr->data;
       g_array_free(arr, FALSE);
     } else if (node->ns == shape_ns && !strcmp(node->name,
"textbox")) {
-      CHAR *str;
       +      char *str;
       
       str = xmlGetProp(node, "x1");
       if (str) {
--- plug-ins/shape/shape-export.c.orig	Fri Jun  1 13:38:55 2001
+++ plug-ins/shape/shape-export.c	Fri Jun  1 13:39:17 2001
@@ -836,7 +836,7 @@ draw_string(RendererShape *renderer,
 	    Point *pos, Alignment alignment,
 	    Color *colour)
 {
-  CHAR *enc;
   +  xmlChar *enc;
   xmlNodePtr node;
   char buf[512], *style, *tmp;
   real saved_width;
--- plug-ins/svg/render_svg.c.orig	Fri Jun  1 13:24:34 2001
+++ plug-ins/svg/render_svg.c	Fri Jun  1 13:24:48 2001
@@ -743,7 +743,7 @@ draw_string(RendererSVG *renderer,
 	    Point *pos, Alignment alignment,
 	    Color *colour)
 {
-  CHAR *enc;
   +  xmlChar *enc;
   xmlNodePtr node;
   char buf[512], *style, *tmp;
   real saved_width;


-- 
Mark Grimes <obecian@openbsd.org>