Update ICU to 58.1

source/i18n/csdetect.cpp

Index: source/i18n/csdetect.cpp
diff --git a/source/i18n/csdetect.cpp b/source/i18n/csdetect.cpp
index 66d8f3a2ae3cc93142b509eb1c2d51638e93f7f4..5dadf3774a14e7549efafc134dc755e11460f367 100644
--- a/source/i18n/csdetect.cpp
+++ b/source/i18n/csdetect.cpp
@@ -1,6 +1,8 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
  **********************************************************************
- *   Copyright (C) 2005-2015, International Business Machines
+ *   Copyright (C) 2005-2016, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  **********************************************************************
  */
@@ -27,8 +29,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 +120,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);