X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/08b89b0a244153b9f5bbb2f49c55ab0f7298122e..b331163bffd790ced0e88b73f44f86d49ccc48a5:/icuSources/tools/tzcode/tz2icu.cpp?ds=sidebyside diff --git a/icuSources/tools/tzcode/tz2icu.cpp b/icuSources/tools/tzcode/tz2icu.cpp index 959556e6..349aabdb 100644 --- a/icuSources/tools/tzcode/tz2icu.cpp +++ b/icuSources/tools/tzcode/tz2icu.cpp @@ -304,9 +304,9 @@ void readzoneinfo(ifstream& file, ZoneInfo& info, bool is64bitData) { } // skip additional Olson byte version file.read(buf, 1); - // if '\0', we have just one copy of data, if '2', there is additional + // if '\0', we have just one copy of data, if '2' or '3', there is additional // 64 bit version at the end. - if(buf[0]!=0 && buf[0]!='2') { + if(buf[0]!=0 && buf[0]!='2' && buf[0]!='3') { throw invalid_argument("Bad Olson version info"); } @@ -1720,10 +1720,10 @@ int main(int argc, char *argv[]) { file << ", International Business Machines" << endl << "// Corporation and others. All Rights Reserved." << endl << "//---------------------------------------------------------" << endl - << "// Build tool: tz2icu" << endl - << "// Build date: " << asctime(now) /* << endl -- asctime emits CR */ - << "// Olson source: ftp://elsie.nci.nih.gov/pub/" << endl - << "// Olson version: " << version << endl + << "// Build tool: tz2icu" << endl + << "// Build date: " << asctime(now) /* << endl -- asctime emits CR */ + << "// tz database: ftp://ftp.iana.org/tz/" << endl + << "// tz version: " << version << endl << "// ICU version: " << U_ICU_VERSION << endl << "//---------------------------------------------------------" << endl << "// >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! <<" << endl