X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=sherlock%2Fxml%2Fdtd.c;h=67cb7ccca08b1638eb576824f7e695ca2eae7879;hb=1d92ad2e62c2f12405aac4339af536591f721f6a;hp=8c50a53265785502445376e1f27bebc46a8d43ac;hpb=b30841cdf97c8e456a35987f984ce5b0f463ceab;p=libucw.git diff --git a/sherlock/xml/dtd.c b/sherlock/xml/dtd.c index 8c50a532..67cb7ccc 100644 --- a/sherlock/xml/dtd.c +++ b/sherlock/xml/dtd.c @@ -13,9 +13,9 @@ #include "sherlock/xml/xml.h" #include "sherlock/xml/dtd.h" #include "sherlock/xml/internals.h" -#include "lib/fastbuf.h" -#include "lib/ff-unicode.h" -#include "lib/unicode.h" +#include "ucw/fastbuf.h" +#include "ucw/ff-unicode.h" +#include "ucw/unicode.h" /* Notations */ @@ -29,7 +29,7 @@ #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" struct xml_dtd_notn * xml_dtd_find_notn(struct xml_context *ctx, char *name) @@ -51,7 +51,7 @@ xml_dtd_find_notn(struct xml_context *ctx, char *name) #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" static struct xml_dtd_entity * xml_dtd_declare_trivial_entity(struct xml_context *ctx, char *name, char *text) @@ -155,7 +155,7 @@ xml_dtd_elems_init_data(struct xml_dtd_elems_table *tab UNUSED, struct xml_dtd_e #define HASH_GIVE_INIT_DATA #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" struct xml_dtd_elem * xml_dtd_find_elem(struct xml_context *ctx, char *name) @@ -200,7 +200,7 @@ xml_dtd_enodes_init_key(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_ #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" /* Element attributes */ @@ -240,7 +240,7 @@ xml_dtd_attrs_init_key(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_at #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" struct xml_dtd_attr * xml_dtd_find_attr(struct xml_context *ctx, struct xml_dtd_elem *elem, char *name) @@ -284,7 +284,7 @@ xml_dtd_evals_init_key(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_ev #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" /* Enumerated attribute notations */ @@ -322,7 +322,7 @@ xml_dtd_enotns_init_key(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_ #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "lib/hashtable.h" +#include "ucw/hashtable.h" /* DTD initialization/cleanup */