Indent

[yaz-moved-to-github.git] / util / yaz-icu.c

diff --git a/util/yaz-icu.c b/util/yaz-icu.c
index d2ef11f..c6e7a0e 100644 (file)
--- a/util/yaz-icu.c
+++ b/util/yaz-icu.c
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-2007, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: yaz-icu.c,v 1.6 2007-10-29 10:22:23 marc Exp $
+ * $Id: yaz-icu.c,v 1.9 2007-11-08 08:17:18 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -17,7 +17,7 @@
 #include <yaz/options.h>
 
 
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
 
 #include <unicode/ucnv.h>
 #include <unicode/ustring.h>
@@ -55,7 +55,6 @@ void print_option_error(const struct config_t *p_config)
             "  <normalize rule=\"[:Control:] Any-Remove\"/>\n"
             "  <tokenize rule=\"l\"/>\n"
             "  <normalize rule=\"[[:WhiteSpace:][:Punctuation:]] Remove\"/>\n"
-            "  <display/>\n"
             "  <casemap rule=\"l\"/>\n"
             "</icu_chain>\n"
           );
@@ -443,7 +442,7 @@ static void process_text_file(const struct config_t *p_config)
     if (!xml_locale || !strlen((const char *) xml_locale))
         return;        
     
-    config.chain = icu_chain_xml_config(xml_node, (uint8_t *) xml_locale, 0,
+    config.chain = icu_chain_xml_config(xml_node, (const char *) xml_locale, 0,
                                         &status);
 
     xmlFree(xml_locale);
@@ -506,13 +505,13 @@ static void process_text_file(const struct config_t *p_config)
         free(line);
 }
 
-#endif /* HAVE_ICU */
+#endif /* YAZ_HAVE_ICU */
 
 
 int main(int argc, char **argv) 
 {
 
-#if HAVE_ICU
+#if YAZ_HAVE_ICU
 
     read_params(argc, argv, &config);
 
@@ -522,14 +521,14 @@ int main(int argc, char **argv)
     if (config.print && strlen(config.print))
         print_info(&config);
 
-#else /* HAVE_ICU */
+#else /* YAZ_HAVE_ICU */
 
     printf("ICU not available on your system.\n"
            "Please install libicu36-dev and icu-doc or similar, "
            "re-configure and re-compile\n");
 
 
-#endif /* HAVE_ICU */
+#endif /* YAZ_HAVE_ICU */
 
     return(0);
 }