ICU-449 sync up with latest source

X-SVN-Rev: 2522
This commit is contained in:
Alan Liu 2000-09-27 16:43:56 +00:00
parent ee51ec2c7e
commit 741b94d474

View file

@ -30,7 +30,6 @@
#include "cmemory.h"
#include "cstring.h"
#include "filestrm.h"
//#include "unicode/udata.h"
#include "unewdata.h"
#include "uoptions.h"
#include "tzdat.h"
@ -109,7 +108,7 @@ class gentz {
UBool useCopyright;
public:
int Main(int argc, const char *argv[]);
int MMain(int argc, char *argv[]);
private:
int32_t writeTzDatFile(const char *destdir);
void parseTzTextFile(FileStream* in);
@ -143,7 +142,7 @@ int main(int argc, char *argv[]) {
#ifdef XP_MAC_CONSOLE
argc=ccommand((char***)&argv);
#endif
return x.Main(argc, (const char**)argv);
return x.MMain(argc, argv);
}
const int32_t gentz::MAX_GMT_OFFSET = (int32_t)24*60*60; // seconds
@ -167,7 +166,7 @@ static UOption options[]={
UOPTION_DESTDIR
};
int gentz::Main(int argc, const char* argv[]) {
int gentz::MMain(int argc, char* argv[]) {
/* preset then read command line options */
options[3].value=u_getDataDirectory();
argc=u_parseArgs(argc, argv, sizeof(options)/sizeof(options[0]), options);