Update ICU to 54.1 step 1

source/common/unormcmp.cpp

Index: source/common/unormcmp.cpp
diff --git a/source/common/unormcmp.cpp b/source/common/unormcmp.cpp
index 521e355883a04684117c4bc9010aac58d58b977f..1b072c4c34d8bedc2a20272486cb36bc55ecf3c6 100644
--- a/source/common/unormcmp.cpp
+++ b/source/common/unormcmp.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2001-2011, International Business Machines
+*   Copyright (C) 2001-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -32,8 +32,6 @@
 
 U_NAMESPACE_USE
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 /* compare canonically equivalent ------------------------------------------- */
 
 /*
@@ -605,7 +603,7 @@ unorm_compare(const UChar *s1, int32_t length1,
     if(!(options&UNORM_INPUT_IS_FCD) || (options&U_FOLD_CASE_EXCLUDE_SPECIAL_I)) {
         const Normalizer2 *n2;
         if(options&U_FOLD_CASE_EXCLUDE_SPECIAL_I) {
-            n2=Normalizer2Factory::getNFDInstance(*pErrorCode);
+            n2=Normalizer2::getNFDInstance(*pErrorCode);
         } else {
             n2=Normalizer2Factory::getFCDInstance(*pErrorCode);
         }