Update ICU to 54.1 step 1

source/tools/makeconv/makeconv.c

Index: source/tools/makeconv/makeconv.c
diff --git a/source/tools/makeconv/makeconv.c b/source/tools/makeconv/makeconv.c
index 424c962251138ce7dc9de7cb865fe198d689f0d6..4eabcba51f5135a651a8511dc1dce478792ada37 100644
--- a/source/tools/makeconv/makeconv.c
+++ b/source/tools/makeconv/makeconv.c
@@ -1,7 +1,7 @@
 /*
  ********************************************************************************
  *
- *   Copyright (C) 1998-2012, International Business Machines
+ *   Copyright (C) 1998-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  ********************************************************************************
@@ -34,8 +34,6 @@
 #include "makeconv.h"
 #include "genmbcs.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define DEBUG 0
 
 typedef struct ConvData {
@@ -213,7 +211,7 @@ int main(int argc, char* argv[])
 
     /* preset then read command line options */
     options[OPT_DESTDIR].value=u_getDataDirectory();
-    argc=u_parseArgs(argc, argv, LENGTHOF(options), options);
+    argc=u_parseArgs(argc, argv, UPRV_LENGTHOF(options), options);
 
     /* error handling, printing usage message */
     if(argc<0) {