Update ICU to 58.1

source/i18n/japancal.cpp

Index: source/i18n/japancal.cpp
diff --git a/source/i18n/japancal.cpp b/source/i18n/japancal.cpp
index 0f985f0a79268e13d158a0f238c2c5e356441375..93ab8008b1aa45550e45fc7b5e333cd424540de3 100644
--- a/source/i18n/japancal.cpp
+++ b/source/i18n/japancal.cpp
@@ -1,7 +1,9 @@
+// Copyright (C) 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
-* Copyright (C) 2003-2009,2012, International Business Machines Corporation and    *
-* others. All Rights Reserved.                                                *
+* Copyright (C) 2003-2009,2012,2016 International Business Machines Corporation and
+* others. All Rights Reserved.
 *******************************************************************************
 *
 * File JAPANCAL.CPP
@@ -15,6 +17,7 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#include "cmemory.h"
 #include "japancal.h"
 #include "unicode/gregocal.h"
 #include "umutex.h"
@@ -276,7 +279,7 @@ static const struct {
     {  1989,    1,  8 }   // Heisei    235
 };
 
-#define kEraCount (sizeof(kEraInfo)/sizeof(kEraInfo[0]))
+#define kEraCount UPRV_LENGTHOF(kEraInfo)
 
 /**
  * The current era, for reference.