Update ICU to 54.1 step 1

source/tools/icuswap/icuswap.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2003-2007, International Business Machines
+*   Copyright (C) 2003-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  icuswap.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2003aug08
 *   created by: Markus W. Scherer
@@ skipping 19 matching lines @@
 #include "swapimpl.h"
 #include "toolutil.h"
 #include "uoptions.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 /* definitions */
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
 #define DEFAULT_PADDING_LENGTH 15
 
 static UOption options[]={
     UOPTION_HELP_H,
     UOPTION_HELP_QUESTION_MARK,
     UOPTION_DEF("type", 't', UOPT_REQUIRES_ARG)
 };
 
 enum {
     OPT_HELP_H,
@@ skipping 68 matching lines @@
     pname=strrchr(argv[0], U_FILE_SEP_CHAR);
     if(pname==NULL) {
         pname=strrchr(argv[0], '/');
     }
     if(pname!=NULL) {
         ++pname;
     } else {
         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);
     }
 
     /* parse the output type option */
     data=(char *)options[OPT_OUT_TYPE].value;
     if(data[0]==0 || data[1]!=0) {
         /* the type must be exactly one letter */
         return printUsage(pname, FALSE);
@@ skipping 495 matching lines @@
 }
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */