Update ICU to 54.1 step 1

source/tools/toolutil/pkg_icu.cpp

 /******************************************************************************
- *   Copyright (C) 2008-2013, International Business Machines
+ *   Copyright (C) 2008-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
 #include "unicode/utypes.h"
 #include "unicode/putil.h"
 #include "cstring.h"
 #include "toolutil.h"
 #include "uoptions.h"
 #include "uparse.h"
 #include "package.h"
 #include "pkg_icu.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 // read a file list -------------------------------------------------------- ***
 
 U_NAMESPACE_USE
 
 static const struct {
     const char *suffix;
     int32_t length;
 } listFileSuffixes[]={
     { ".txt", 4 },
     { ".lst", 4 },
     { ".tmp", 4 }
 };
 
 /* check for multiple text file suffixes to see if this list name is a text file name */
 static UBool
 isListTextFile(const char *listname) {
     const char *listNameEnd=strchr(listname, 0);
     const char *suffix;
     int32_t i, length;
-    for(i=0; i<LENGTHOF(listFileSuffixes); ++i) {
+    for(i=0; i<UPRV_LENGTHOF(listFileSuffixes); ++i) {
         suffix=listFileSuffixes[i].suffix;
         length=listFileSuffixes[i].length;
         if((listNameEnd-listname)>length && 0==memcmp(listNameEnd-length, suffix, length)) {
             return TRUE;
         }
     }
     return FALSE;
 }
 
 /*
@@ skipping 123 matching lines @@
     pkg->writePackage(outFilename, outType, outComment);
 
     if (pkgDelete) {
         delete pkg;
         delete addListPkg;
     }
 
     return 0;
 }