ICU-57131.0.1.tar.gz

[apple/icu.git] / icuSources / test / intltest / windttst.cpp

diff --git a/icuSources/test/intltest/windttst.cpp b/icuSources/test/intltest/windttst.cpp
index b8b0823ec135c133061aabfd22294986e56ce066..d0002ce8bab00b687ad748e0f50f05d57d6ea092 100644 (file)
--- a/icuSources/test/intltest/windttst.cpp
+++ b/icuSources/test/intltest/windttst.cpp
@@ -1,6 +1,6 @@
 /*
 ********************************************************************************
-*   Copyright (C) 2005-2011, International Business Machines
+*   Copyright (C) 2005-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
@@ -39,8 +39,6 @@
 #   define NOMCX
 #   include <windows.h>
 
-#define ARRAY_SIZE(array) (sizeof array / sizeof array[0])
-
 static const char *getCalendarType(int32_t type)
 {
     switch (type)
@@ -131,8 +129,8 @@ void Win32DateTimeTest::testLocales(TestLog *log)
         Locale ulocale(localeID);
         int32_t wdLength, wtLength;
 
-        wdLength = GetDateFormatW(lcidRecords[i].lcid, DATE_LONGDATE, &winNow, NULL, wdBuffer, ARRAY_SIZE(wdBuffer));
-        wtLength = GetTimeFormatW(lcidRecords[i].lcid, 0, &winNow, NULL, wtBuffer, ARRAY_SIZE(wtBuffer));
+        wdLength = GetDateFormatW(lcidRecords[i].lcid, DATE_LONGDATE, &winNow, NULL, wdBuffer, UPRV_LENGTHOF(wdBuffer));
+        wtLength = GetTimeFormatW(lcidRecords[i].lcid, 0, &winNow, NULL, wtBuffer, UPRV_LENGTHOF(wtBuffer));
 
         if (uprv_strchr(localeID, '@') > 0) {
             uprv_strcat(localeID, ";");