ICU-461.12.tar.gz

[apple/icu.git] / icuSources / i18n / usrchimp.h

diff --git a/icuSources/i18n/usrchimp.h b/icuSources/i18n/usrchimp.h
index ae95e94147c1ceb5534ce75c3c86376b81e9626e..986db33699fcfd8b4f4fe6f304f9d31c97bb1261 100644 (file)
--- a/icuSources/i18n/usrchimp.h
+++ b/icuSources/i18n/usrchimp.h
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 2001-2008 IBM and others. All rights reserved.
+*   Copyright (C) 2001-2010 IBM and others. All rights reserved.
 **********************************************************************
 *   Date        Name        Description
 *  08/13/2001   synwee      Creation.
@@ -13,6 +13,7 @@
 
 #if !UCONFIG_NO_COLLATION
 
+#include "unicode/normalizer2.h"
 #include "unicode/ucol.h"
 #include "unicode/ucoleitr.h"
 #include "unicode/ubrk.h"
@@ -26,7 +27,8 @@ struct USearch {
           int32_t             textLength; // exact length
           UBool               isOverlap;
           UBool               isCanonicalMatch;
-          UBreakIterator        *internalBreakIter;  //internal character breakiterator
+          int16_t             elementComparisonType;
+          UBreakIterator     *internalBreakIter;  //internal character breakiterator
           UBreakIterator     *breakIter;
     // value USEARCH_DONE is the default value
     // if we are not at the start of the text or the end of the text, 
@@ -59,6 +61,7 @@ struct UStringSearch {
     struct USearch            *search;
     struct UPattern            pattern;
     const  UCollator          *collator;
+    const  U_NAMESPACE_QUALIFIER Normalizer2 *nfd;
     // positions within the collation element iterator is used to determine
     // if we are at the start of the text.
            UCollationElements *textIter;