From: Pavel Charvat Date: Fri, 6 Dec 2013 12:18:26 +0000 (+0100) Subject: Added libucw-* prefix to some forgotten places. X-Git-Tag: v5.99~65 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=afea6a4bc1fec546a4a7b62fd39840749ff14b9d;p=libucw.git Added libucw-* prefix to some forgotten places. --- diff --git a/default.cfg b/default.cfg index 0b05139e..3ec89117 100644 --- a/default.cfg +++ b/default.cfg @@ -23,7 +23,7 @@ Set("CONFIG_UCW_PERL_MODULES" => 1); Set("CONFIG_UCW_SHELL_UTILS" => 1); Set("CONFIG_UCW_UTILS" => 1); -# Libimages settings +# Libucw-images settings UnSet("CONFIG_IMAGES"); Set("CONFIG_IMAGES_LIBJPEG"); Set("CONFIG_IMAGES_LIBPNG"); @@ -31,12 +31,12 @@ Set("CONFIG_IMAGES_LIBUNGIF"); UnSet("CONFIG_IMAGES_LIBGIF"); UnSet("CONFIG_IMAGES_LIBMAGICK"); -# Libcharset +# Libucw-charset UnSet("CONFIG_CHARSET"); Set("CONFIG_CHARSET_UTILS"); -# Libshxml -UnSet("CONFIG_SHXML"); +# Libucw-xml +UnSet("CONFIG_UCW_XML"); # Return success 1; diff --git a/examples/internal/default.cfg b/examples/internal/default.cfg index a133ba26..984be67d 100644 --- a/examples/internal/default.cfg +++ b/examples/internal/default.cfg @@ -6,13 +6,7 @@ Set("CONFIG_LOCAL"); # We want to build all libraries shared Set("CONFIG_SHARED"); -# Liblang settings -Set("CONFIG_LIBLANG"); -Set("CONFIG_LANG"); -Set("MAX_WORD_CHARS" => 64); -Set("MAX_WORD_BYTES" => 192); - -# Libimages settings +# Libucw-images settings Set("CONFIG_IMAGES"); Set("CONFIG_IMAGES_LIBJPEG"); Set("CONFIG_IMAGES_LIBPNG"); diff --git a/shxml/xml.h b/shxml/xml.h index 074c6049..f17b1d79 100644 --- a/shxml/xml.h +++ b/shxml/xml.h @@ -150,7 +150,7 @@ struct xml_source { uns refill_cat2; /* Character categories, which should be processed as newlines (possibly in some built-in sequences) */ void (*refill)(struct xml_context *ctx); /* Callback to decode source characters to the buffer */ - unsigned short *refill_in_to_x; /* Libcharset input table */ + unsigned short *refill_in_to_x; /* Libucw-charset input table */ uns saved_depth; /* Saved ctx->depth */ uns pending_0xd; /* The last read character is 0xD */ };