Update ICU to 54.1 step 1

source/test/cintltst/utmstest.c

 /*
  ****************************************************************************
- * Copyright (c) 1997-2013, International Business Machines Corporation and *
+ * Copyright (c) 1997-2014, International Business Machines Corporation and *
  * others. All Rights Reserved.                                             *
  ****************************************************************************
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/utmscale.h"
 #include "unicode/ucal.h"
 
 #include "cintltst.h"
+#include "cmemory.h"
 
 #include <stdlib.h>
 #include <time.h>
 
-#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
-
 #define LOOP_COUNT 10000
 
 static void TestAPI(void);
 static void TestData(void);
 static void TestMonkey(void);
 static void TestDotNet(void);
 
 void addUtmsTest(TestNode** root);
 
 void addUtmsTest(TestNode** root)
@@ skipping 422 matching lines @@
 
     /* Open a proleptic Gregorian calendar. */
     errorCode = U_ZERO_ERROR;
     cal = ucal_open(utc, -1, "", UCAL_GREGORIAN, &errorCode);
     ucal_setGregorianChange(cal, -1000000 * (dayMillis * (UDate)1), &errorCode);
     if(U_FAILURE(errorCode)) {
         log_data_err("ucal_open(UTC/proleptic Gregorian) failed: %s - (Are you missing data?)\n", u_errorName(errorCode));
         ucal_close(cal);
         return;
     }
-    for(i = 0; i < LENGTHOF(dotNetDateTimeTicks); ++i) {
+    for(i = 0; i < UPRV_LENGTHOF(dotNetDateTimeTicks); ++i) {
         /* Test conversion from .Net/Universal time to ICU time. */
         dt = dotNetDateTimeTicks + i;
         millis = utmscale_toInt64(dt->ticks, UDTS_ICU4C_TIME, &errorCode);
         ucal_clear(cal);
         ucal_setDate(cal, dt->year, dt->month - 1, dt->day, &errorCode); /* Java & ICU use January = month 0. */
         icuDate = ucal_getMillis(cal, &errorCode);
         if(millis != icuDate) {
             /* Print days not millis to stay within printf() range. */
             log_err("utmscale_toInt64(ticks[%d], ICU4C)=%dd != %dd=ucal_getMillis(%04d-%02d-%02d)\n",
                     (int)i, (int)(millis/dayMillis), (int)(icuDate/dayMillis), (int)dt->year, (int)dt->month, (int)dt->day);
         }
 
         /* Test conversion from ICU time to .Net/Universal time. */
         ticks = utmscale_fromInt64((int64_t)icuDate, UDTS_ICU4C_TIME, &errorCode);
         if(ticks != dt->ticks) {
             /* Print days not ticks to stay within printf() range. */
             log_err("utmscale_fromInt64(date[%d], ICU4C)=%dd != %dd=.Net System.DateTime(%04d-%02d-%02d).Ticks\n",
                     (int)i, (int)(ticks/dayTicks), (int)(dt->ticks/dayTicks), (int)dt->year, (int)dt->month, (int)dt->day);
         }
     }
 
     ucal_close(cal);
 }
 
 #endif /* #if !UCONFIG_NO_FORMATTING */