Update ICU to 54.1 step 1

source/tools/makeconv/makeconv.c

 /*
  ********************************************************************************
  *
- *   Copyright (C) 1998-2012, International Business Machines
+ *   Copyright (C) 1998-2014, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  ********************************************************************************
  *
  *
  *  makeconv.c:
  *  tool creating a binary (compressed) representation of the conversion mapping
  *  table (IBM NLTC ucmap format).
  *
  *  05/04/2000    helena     Added fallback mapping into the picture...
@@ skipping 12 matching lines @@
 #include "filestrm.h"
 #include "toolutil.h"
 #include "uoptions.h"
 #include "unicode/udata.h"
 #include "unewdata.h"
 #include "uparse.h"
 #include "ucm.h"
 #include "makeconv.h"
 #include "genmbcs.h"
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define DEBUG 0
 
 typedef struct ConvData {
     UCMFile *ucm;
     NewConverter *cnvData, *extData;
     UConverterSharedData sharedData;
     UConverterStaticData staticData;
 } ConvData;
 
 static void
@@ skipping 157 matching lines @@
     err = U_ZERO_ERROR;
 
     U_MAIN_INIT_ARGS(argc, argv);
 
     /* Set up the ICU version number */
     u_getVersion(icuVersion);
     uprv_memcpy(&dataInfo.dataVersion, &icuVersion, sizeof(UVersionInfo));
 
     /* 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) {
         fprintf(stderr,
             "error in command line argument \"%s\"\n",
             argv[-argc]);
     } else if(argc<2) {
         argc=-1;
     }
     if(argc<0 || options[OPT_HELP_H].doesOccur || options[OPT_HELP_QUESTION_MARK].doesOccur) {
@@ skipping 622 matching lines @@
 }
 
 /*
  * Hey, Emacs, please set the following:
  *
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  *
  */