Update ICU to 54.1 step 1

source/test/perf/normperf/normperf.cpp

Index: source/test/perf/normperf/normperf.cpp
diff --git a/source/test/perf/normperf/normperf.cpp b/source/test/perf/normperf/normperf.cpp
index 011bbcbd3ec71487620b4c607e969da94f938cc8..3d14f8eecf3c4dc92ba56f27532ec3d1ddb58aaf 100644
--- a/source/test/perf/normperf/normperf.cpp
+++ b/source/test/perf/normperf/normperf.cpp
@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-* Copyright (c) 2002-2005, International Business Machines
+* Copyright (c) 2002-2014, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 **********************************************************************
@@ -13,10 +13,9 @@
  */
 #include "normperf.h"
 #include "uoptions.h"
+#include "cmemory.h" // for UPRV_LENGTHOF
 #include <stdio.h>
 
-#define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
-
 UPerfFunction* NormalizerPerformanceTest::runIndexedTest(int32_t index, UBool exec,const char* &name, char* par) {
     switch (index) {
         TESTCASE(0,TestICU_NFC_NFD_Text);
@@ -132,7 +131,7 @@ NormalizerPerformanceTest::NormalizerPerformanceTest(int32_t argc, const char* a
         return;
     }
 
-    _remainingArgc = u_parseArgs(_remainingArgc, (char **)argv, (int32_t)(LENGTHOF(cmdLineOptions)), cmdLineOptions);
+    _remainingArgc = u_parseArgs(_remainingArgc, (char **)argv, (int32_t)(UPRV_LENGTHOF(cmdLineOptions)), cmdLineOptions);
     if(cmdLineOptions[0].doesOccur && cmdLineOptions[0].value!=NULL) {
         options=(int32_t)strtol(cmdLineOptions[0].value, NULL, 16);
     }