X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ficu_I18N.h;h=27f7a3aa1c95423749a7ceb69082c0ee3585f8d6;hb=0ff1a97b2a69905755b9adb24a474d30f1c52150;hp=8ad7b11e6db4367925af121d5d26792af71b2c93;hpb=b55d58436ec1d0b56ea2833ab8a711f8b9232ed7;p=pazpar2-moved-to-github.git

diff --git a/src/icu_I18N.h b/src/icu_I18N.h
index 8ad7b11..27f7a3a 100644
--- a/src/icu_I18N.h
+++ b/src/icu_I18N.h
@@ -1,4 +1,4 @@
-/* $Id: icu_I18N.h,v 1.16 2007-05-21 10:14:08 marc Exp $
+/* $Id: icu_I18N.h,v 1.18 2007-09-10 16:05:48 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
    This file is part of Pazpar2.
@@ -22,8 +22,6 @@
 #ifndef ICU_I18NL_H
 #define ICU_I18NL_H
 
-#ifdef HAVE_ICU
-
 #include <yaz/nmem.h>
 
 #include <libxml/parser.h>
@@ -187,8 +185,8 @@ struct icu_token
 enum icu_chain_step_type {
     ICU_chain_step_type_none,      // 
     ICU_chain_step_type_display,   // convert to utf8 display format 
-    ICU_chain_step_type_norm,      // convert to utf8 norm format 
-    ICU_chain_step_type_sort,      // convert to utf8 sort format 
+    ICU_chain_step_type_index,     // convert to utf8 index format 
+    ICU_chain_step_type_sortkey,   // convert to utf8 sortkey format 
     ICU_chain_step_type_casemap,   // apply utf16 charmap
     ICU_chain_step_type_normalize, // apply utf16 normalization
     ICU_chain_step_type_tokenize   // apply utf16 tokenization 
@@ -283,5 +281,4 @@ const char * icu_chain_get_sort(struct icu_chain * chain);
 
 
 
-#endif // HAVE_ICU
 #endif // ICU_I18NL_H