ICU-461.18.tar.gz

[apple/icu.git] / icuSources / tools / tzcode / zic.c

diff --git a/icuSources/tools/tzcode/zic.c b/icuSources/tools/tzcode/zic.c
index fcc3c82367119ac0c7360d7d8b07fa1638ff6fc2..5dc9db01bc99ccdf0b8dd22c004f337e4805135b 100644 (file)
--- a/icuSources/tools/tzcode/zic.c
+++ b/icuSources/tools/tzcode/zic.c
@@ -2371,22 +2371,11 @@ wp = ecpyalloc(_("no POSIX environment variable for zone"));
                                         * Rule Brazil is impacted by this limitation, because
                                         * the final set of rules are starting in 2038.  Although
                                         * this code put the first couple of transitions populated
-                                        * by the final rules, they will be dropped off when
-                                        * collecting transition times.  So, we need to keep
-                                        * the start year of the final rule in 2038, not 2039.
-                                        * Fortunately, the Brazil rules in 2038 and beyond use
-                                        * the same base offset/dst saving amount.  Thus, even
-                                        * we skip the first couple of transitions, the final
-                                        * rule set for 2038 works properly.  So for now,
-                                        * we do not increment the final rule start year only when
-                                        * it falls into year 2038. We need to revisit this code
-                                        * in future to fix the root cause of this problem (ICU
-                                        * resource type limitation - signed int32).
-                                        * Oct 7, 2008 - Yoshito */
-                                       int finalStartYear = (year == 2038) ? year : year + 1;
+                                        * by the final rules, they might be dropped off when
+                                        * collecting transition times by tz2icu. */
                                        emit_icu_zone(icuFile,
                                                        zpfirst->z_name, zp->z_gmtoff,
-                                                       rp, finalRuleIndex, finalStartYear);
+                                                       rp, finalRuleIndex, year + 1);
                                        /* only emit this for the first year */
                                        finalRule1 = NULL;
                                }