Update ICU to 54.1 step 1

source/tools/icupkg/icupkg.cpp

 /*
 *******************************************************************************
 *
-*   Copyright (C) 2005-2013, International Business Machines
+*   Copyright (C) 2005-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   file name:  icupkg.cpp
 *   encoding:   US-ASCII
 *   tab size:   8 (not used)
 *   indentation:4
 *
 *   created on: 2005jul29
 *   created by: Markus W. Scherer
@@ skipping 25 matching lines @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 U_NAMESPACE_USE
 
 // TODO: add --matchmode=regex for using the ICU regex engine for item name pattern matching?
 
 // general definitions ----------------------------------------------------- ***
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 // main() ------------------------------------------------------------------ ***
 
 static void
 printUsage(const char *pname, UBool isHelp) {
     FILE *where=isHelp ? stdout : stderr;
 
     fprintf(where,
             "%csage: %s [-h|-?|--help ] [-tl|-tb|-te] [-c] [-C comment]\n"
             "\t[-a list] [-r list] [-x list] [-l [-o outputListFileName]]\n"
             "\t[-s path] [-d path] [-w] [-m mode]\n"
@@ skipping 197 matching lines @@
     UBool isHelp, isModified, isPackage;
     int result = 0;
 
     Package *pkg, *listPkg, *addListPkg;
 
     U_MAIN_INIT_ARGS(argc, argv);
 
     /* get the program basename */
     pname=findBasename(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) {
         printUsage(pname, TRUE);
         return U_ZERO_ERROR;
     }
 
     pkg=new Package;
     if(pkg==NULL) {
         fprintf(stderr, "icupkg: not enough memory\n");
         return U_MEMORY_ALLOCATION_ERROR;
@@ skipping 265 matching lines @@
 }
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */