make regex and asciidoc work on Darwin without hacking

[libucw.git] / sherlock / xml / dtd.h

diff --git a/sherlock/xml/dtd.h b/sherlock/xml/dtd.h
index ba57ee35221b14932868c226c3516f13d6768662..e2caf98731ca59ea6a52647848b126ae44344142 100644 (file)
--- a/sherlock/xml/dtd.h
+++ b/sherlock/xml/dtd.h
@@ -15,7 +15,7 @@
 struct xml_dtd {
   struct mempool *pool;                        /* Memory pool where to allocate DTD */
   slist ents;                          /* Link list of general entities */
 struct xml_dtd {
   struct mempool *pool;                        /* Memory pool where to allocate DTD */
   slist ents;                          /* Link list of general entities */

-  slist pents;                         /* Link list of parapeter entities */
+  slist pents;                         /* Link list of parameter entities */

   slist notns;                         /* Link list of notations */
   slist elems;                         /* Link list of elements */
   void *tab_ents;                      /* Hash table of general entities */
   slist notns;                         /* Link list of notations */
   slist elems;                         /* Link list of elements */
   void *tab_ents;                      /* Hash table of general entities */


@@ -31,7 +31,7 @@ struct xml_dtd {
 /* Notations */
 
 enum xml_dtd_notn_flags {
 /* Notations */
 
 enum xml_dtd_notn_flags {

-  XML_DTD_NOTN_DECLARED = 0x1,         /* The notation has been declared (interbal usage) */
+  XML_DTD_NOTN_DECLARED = 0x1,         /* The notation has been declared (internal usage) */

 };
 
 struct xml_dtd_notn {
 };
 
 struct xml_dtd_notn {


@@ -89,6 +89,7 @@ struct xml_dtd_elem {
   uns type;
   char *name;
   struct xml_dtd_elem_node *node;
   uns type;
   char *name;
   struct xml_dtd_elem_node *node;

+  slist attrs;

   void *user;                          /* User-defined */
 };
 
   void *user;                          /* User-defined */
 };
 


@@ -140,6 +141,7 @@ enum xml_dtd_attr_type {
 };
 
 struct xml_dtd_attr {
 };
 
 struct xml_dtd_attr {

+  snode n;

   char *name;                          /* Attribute name */
   struct xml_dtd_elem *elem;           /* Owner element */
   uns type;                            /* See enum xml_dtd_attr_type */
   char *name;                          /* Attribute name */
   struct xml_dtd_elem *elem;           /* Owner element */
   uns type;                            /* See enum xml_dtd_attr_type */