diff --git a/src/sbbs3/scfg/scfgsys.c b/src/sbbs3/scfg/scfgsys.c index ef9f6e5067e008247ecb569a3117e98635329e36..4b9c56dc36882e7088a95a34aeaef5712e8d13de 100644 --- a/src/sbbs3/scfg/scfgsys.c +++ b/src/sbbs3/scfg/scfgsys.c @@ -234,9 +234,10 @@ void sys_cfg(void) strcpy(opt[i++],"Bangkok"); strcpy(opt[i++],"Hong Kong"); strcpy(opt[i++],"Tokyo"); - strcpy(opt[i++],"Sydney"); + strcpy(opt[i++],"Australian Central"); + strcpy(opt[i++],"Australian Eastern"); strcpy(opt[i++],"Noumea"); - strcpy(opt[i++],"Wellington"); + strcpy(opt[i++],"New Zealand"); strcpy(opt[i++],"Other..."); opt[i][0]=0; i=0; @@ -324,13 +325,16 @@ void sys_cfg(void) cfg.sys_timezone=TOK; break; case 22: - cfg.sys_timezone=SYD; + cfg.sys_timezone=ACST; break; case 23: - cfg.sys_timezone=NOU; + cfg.sys_timezone=AEST; break; case 24: - cfg.sys_timezone=WEL; + cfg.sys_timezone=NOU; + break; + case 25: + cfg.sys_timezone=NZST; configure_dst(); break; default: diff --git a/src/smblib/smbdefs.h b/src/smblib/smbdefs.h index 4b7a99829bc3b63b0719bea86559b6c37d9c0f01..b54f3d7d9aa788f4d1a98aebd7e1c6b8d2117fba 100644 --- a/src/smblib/smbdefs.h +++ b/src/smblib/smbdefs.h @@ -123,7 +123,7 @@ #define HDT 0xC258 /* Hawaii/Alaska (-09:00) */ #define BDT 0xC294 /* Bering (-10:00) */ - /* Non-standard Time Zones */ + /* Non-US Time Zones */ #define MID 0x2294 /* Midway (-11:00) */ #define VAN 0x21E0 /* Vancouver (-08:00) */ #define EDM 0x21A4 /* Edmonton (-07:00) */ @@ -149,13 +149,18 @@ #define BAN 0x11A4 /* Bangkok (+07:00) */ #define HON 0x11E0 /* Hong Kong (+08:00) */ #define TOK 0x121C /* Tokyo (+09:00) */ -#define SYD 0x1258 /* Sydney (+10:00) */ +#define ACST 0x123a /* Australian Central (+09:30) */ +#define AEST 0x1258 /* Australian Eastern (+10:00) (Sydney) */ +#define ACDT 0x923a /* Australian Central D (+10:30) */ +#define AEDT 0x9258 /* Australian Eastern D (+11:00) (Sydney) */ #define NOU 0x1294 /* Noumea (+11:00) */ -#define WEL 0x12D0 /* Wellington (+12:00) */ +#define NZST 0x12D0 /* New Zealand (+12:00) (Wellington) */ +#define NZDT 0x92D0 /* New Zealand Daylight (+13:00) (Wellington) */ #define OTHER_ZONE(zone) (zone<=1000 && zone>=-1000) -#define SMB_TZ_HAS_DST(zone) ((!OTHER_ZONE(zone)) && ((zone&(US_ZONE|DAYLIGHT)) || zone==WET || zone==CET || zone==EET || zone==WEL)) +#define SMB_TZ_HAS_DST(zone) ((!OTHER_ZONE(zone)) && ((zone&(US_ZONE|DAYLIGHT)) \ + || zone==WET || zone==CET || zone==EET || zone==NZST || zone==AEST || zone==ACST)) /* Valid hfield_t.types */ #define SENDER 0x00 diff --git a/src/smblib/smbstr.c b/src/smblib/smbstr.c index 83fb1f2dbdf97302c3b59bc13894c9b34fa48715..51f969ee67824ed7b73bc5c09d7a362f2d41199f 100644 --- a/src/smblib/smbstr.c +++ b/src/smblib/smbstr.c @@ -228,9 +228,13 @@ char* SMBCALL smb_zonestr(int16_t zone, char* str) case BAN: return("BAN"); case HON: return("HON"); case TOK: return("TOK"); - case SYD: return("SYD"); + case ACST: return("ACST"); + case ACDT: return("ACDT"); + case AEST: return("AEST"); + case AEDT: return("AEDT"); case NOU: return("NOU"); - case WEL: return("WEL"); + case NZST: return("NZST"); + case NZDT: return("NZDT"); } if(!OTHER_ZONE(zone)) {