X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fyaz%2Ficu_I18N.h;h=5be395702a88aa3bd2de644079600d7f09defad6;hp=0b06dbdab03cce547cd68a1020cb3deddcee06d9;hb=d940392c53c32ccf76fb287cc5b997b9e921a431;hpb=307c60cf35acbe8d004b002e59416a2ebe3cb32d

diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h
index 0b06dbd..5be3957 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           */
 
@@ -102,33 +100,31 @@ UErrorCode icu_utf16_to_utf8(struct icu_buf_utf8 * dest8,
 
 struct icu_casemap
 {
-    char locale[16];
     char action;
 };
 
-struct icu_casemap * icu_casemap_create(const char *locale, char action,
-                                        UErrorCode *status);
+struct icu_casemap * icu_casemap_create(char action, UErrorCode *status);
 
 void icu_casemap_destroy(struct icu_casemap * casemap);
 
 int icu_casemap_casemap(struct icu_casemap * casemap,
                         struct icu_buf_utf16 * dest16,
                         struct icu_buf_utf16 * src16,
-                        UErrorCode *status);
+                        UErrorCode *status,
+                        const char *locale);
 
 int icu_utf16_casemap(struct icu_buf_utf16 * dest16,
                       struct icu_buf_utf16 * src16,
                       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;
@@ -226,7 +222,7 @@ void icu_chain_step_destroy(struct icu_chain_step * step);
 
 struct icu_chain
 {
-    uint8_t locale[16];
+    char *locale;
     int sort;
 
     const char * src8cstr;