Update ICU to 58.1

source/extra/scrptrun/srtest.cpp

Index: source/extra/scrptrun/srtest.cpp
diff --git a/source/extra/scrptrun/srtest.cpp b/source/extra/scrptrun/srtest.cpp
index 8b6b550da31b18bf1baaddf87d821290dae9f502..d4ec8506d0dba36326eb74ba6ad0054e60e4ed10 100644
--- a/source/extra/scrptrun/srtest.cpp
+++ b/source/extra/scrptrun/srtest.cpp
@@ -1,13 +1,16 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
  * %W% %E%
  *
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved
+ * (C) Copyright IBM Corp. 2001-2016 - All Rights Reserved
  *
  */
 
 #include "unicode/utypes.h"
 #include "unicode/uscript.h"
 
+#include "cmemory.h"
 #include "scrptrun.h"
 
 #include <stdio.h>
@@ -22,7 +25,7 @@ UChar testChars[] = {
             0xD801, 0xDC00, 0xD801, 0xDC01, 0xD801, 0xDC02, 0xD801, 0xDC03
 };
 
-int32_t testLength = sizeof testChars / sizeof testChars[0];
+int32_t testLength = UPRV_LENGTHOF(testChars);
 
 void main()
 {
@@ -35,4 +38,4 @@ void main()
 
         printf("Script '%s' from %d to %d.\n", uscript_getName(code), start, end);
     }
-}
+}