Update ICU to 58.1

source/extra/uconv/uwmsg.c

Index: source/extra/uconv/uwmsg.c
diff --git a/source/extra/uconv/uwmsg.c b/source/extra/uconv/uwmsg.c
index a182a719a67d1acd73d5da782b388edc833259a6..ecc98d1c059dcd5d6c1e6f12ca46175d57d3d543 100644
--- a/source/extra/uconv/uwmsg.c
+++ b/source/extra/uconv/uwmsg.c
@@ -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) 1998-2014, International Business Machines Corporation
+* Copyright (C) 1998-2016, International Business Machines Corporation
 * and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -19,6 +21,7 @@
 #include "unicode/uwmsg.h"
 #include "unicode/ures.h"
 #include "unicode/putil.h"
+#include "cmemory.h"
 #include "cstring.h"
 
 #include <stdlib.h>
@@ -143,7 +146,7 @@ U_CFUNC int u_wmsg(FILE *fp, const char *tag, ... )
     }
 
 #if UCONFIG_NO_FORMATTING
-    resultLength = sizeof(gNoFormatting) / U_SIZEOF_UCHAR;
+    resultLength = UPRV_LENGTHOF(gNoFormatting);
     if((msgLen + resultLength) <= UPRV_LENGTHOF(result)) {
         memcpy(result, msg, msgLen * U_SIZEOF_UCHAR);
         memcpy(result + msgLen, gNoFormatting, resultLength);