Update ICU to 54.1 step 1

source/tools/icuswap/icuswap.cpp

Index: source/tools/icuswap/icuswap.cpp
diff --git a/source/tools/icuswap/icuswap.cpp b/source/tools/icuswap/icuswap.cpp
index a5295df651f91d78ce574d01c473eb0542ee7a8a..2bc5a6cc2e31205b03e8d8ea0b339569f7d8ac7e 100644
--- a/source/tools/icuswap/icuswap.cpp
+++ b/source/tools/icuswap/icuswap.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2003-2007, International Business Machines
+*   Copyright (C) 2003-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -41,7 +41,6 @@
 
 /* definitions */
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
 #define DEFAULT_PADDING_LENGTH 15
 
 static UOption options[]={
@@ -130,7 +129,7 @@ main(int argc, char *argv[]) {
         pname=argv[0];
     }
 
-    argc=u_parseArgs(argc, argv, LENGTHOF(options), options);
+    argc=u_parseArgs(argc, argv, UPRV_LENGTHOF(options), options);
     ishelp=options[OPT_HELP_H].doesOccur || options[OPT_HELP_QUESTION_MARK].doesOccur;
     if(ishelp || argc!=3) {
         return printUsage(pname, ishelp);