X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b331163bffd790ced0e88b73f44f86d49ccc48a5..ef6cf650f4a75c3f97de06b51fa104f2069b9ea2:/icuSources/i18n/csdetect.cpp?ds=sidebyside diff --git a/icuSources/i18n/csdetect.cpp b/icuSources/i18n/csdetect.cpp index 66d8f3a2..340a05cb 100644 --- a/icuSources/i18n/csdetect.cpp +++ b/icuSources/i18n/csdetect.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 2005-2015, International Business Machines + * Copyright (C) 2005-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -27,8 +27,6 @@ #include "csrucode.h" #include "csr2022.h" -#define ARRAY_SIZE(array) (sizeof array / sizeof array[0]) - #define NEW_ARRAY(type,count) (type *) uprv_malloc((count) * sizeof(type)) #define DELETE_ARRAY(array) uprv_free((void *) (array)) @@ -120,7 +118,7 @@ static void U_CALLCONV initRecognizers(UErrorCode &status) { new CSRecognizerInfo(new CharsetRecog_IBM420_ar_ltr(), FALSE) #endif }; - int32_t rCount = ARRAY_SIZE(tempArray); + int32_t rCount = UPRV_LENGTHOF(tempArray); fCSRecognizers = NEW_ARRAY(CSRecognizerInfo *, rCount);