Update ICU to 54.1 step 1

source/common/unorm.cpp

 /*
 ******************************************************************************
-* Copyright (c) 1996-2011, International Business Machines
+* Copyright (c) 1996-2014, International Business Machines
 * Corporation and others. All Rights Reserved.
 ******************************************************************************
 * File unorm.cpp
 *
 * Created by: Vladimir Weinstein 12052000
 *
 * Modification history :
 *
 * Date        Name        Description
 * 02/01/01    synwee      Added normalization quickcheck enum and method.
@@ skipping 16 matching lines @@
 #include "unicode/udata.h"
 #include "unicode/ustring.h"
 #include "unicode/uiter.h"
 #include "unicode/unorm.h"
 #include "unicode/unorm2.h"
 #include "normalizer2impl.h"
 #include "unormimp.h"
 #include "uprops.h"
 #include "ustr_imp.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 U_NAMESPACE_USE
 
 /* quick check functions ---------------------------------------------------- */
 
 U_CAPI UNormalizationCheckResult U_EXPORT2
 unorm_quickCheck(const UChar *src,
                  int32_t srcLength, 
                  UNormalizationMode mode,
                  UErrorCode *pErrorCode) {
     const Normalizer2 *n2=Normalizer2Factory::getInstance(mode, *pErrorCode);
@@ skipping 219 matching lines @@
         }
         FilteredNormalizer2 fn2(*n2, *uni32);
         return _concatenate(left, leftLength, right, rightLength,
             dest, destCapacity, &fn2, pErrorCode);
     }
     return _concatenate(left, leftLength, right, rightLength,
         dest, destCapacity, n2, pErrorCode);
 }
 
 #endif /* #if !UCONFIG_NO_NORMALIZATION */