X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Ficu_I18N.h;h=f69daf905c8a360358a6c44d7a98191375de31b1;hb=6f7757087a49db5fb3fa4f3b12b8b67ebbbe3aa3;hp=970d517aebea7342f3ce27263f7828a9b05d63ce;hpb=20d2c2d674de4b78f90de2356537a4ea542aeeac;p=yaz-moved-to-github.git

diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index 970d517..f69daf9 100644
--- a/include/yaz/icu_I18N.h
+++ b/include/yaz/icu_I18N.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 1995-2007, Index Data
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data.
  * All rights reserved.
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -34,8 +34,6 @@
 
 #include <yaz/yconfig.h>
 
-#include <libxml/tree.h>
-
 #include <unicode/utypes.h>   /* Basic ICU data types */
 #include <unicode/uchar.h>    /* char names           */
 
@@ -120,14 +118,13 @@ int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
                       const char *locale, char action,
                       UErrorCode *status);
 
-UErrorCode icu_sortkey8_from_utf16(UCollator *coll,
-                                   struct icu_buf_utf8 * dest8, 
-                                   struct icu_buf_utf16 * src16,
-                                   UErrorCode * status);
+void icu_sortkey8_from_utf16(UCollator *coll,
+                             struct icu_buf_utf8 * dest8, 
+                             struct icu_buf_utf16 * src16,
+                             UErrorCode * status);
 
 struct icu_tokenizer
 {
-    char locale[16];
     char action;
     UBreakIterator* bi;
     struct icu_buf_utf16 * buf16;
@@ -169,7 +166,7 @@ struct icu_normalizer
 {
     char action;
     struct icu_buf_utf16 * rules16;
-    UParseError parse_error[256];
+    UParseError parse_error;
     UTransliterator * trans;
 };
 
@@ -225,7 +222,7 @@ void icu_chain_step_destroy(struct icu_chain_step * step);
 
 struct icu_chain
 {
-    char locale[16];
+    char *locale;
     int sort;
 
     const char * src8cstr;