Synchronet now requires the libarchive development package (e.g. libarchive-dev on Debian-based Linux distros, libarchive.org for more info) to build successfully.

Commit 8294d741 authored by rswindell's avatar rswindell

Australian and New Zealand time zone fixups:

"SYD" (Sydney) +10:00, is now "AEST" with a DST (+11:00) counterpart, AEDT.
Added ACST (+9:30) with its DST (+10:30) counterpart, ACDT.
"WEL" (Wellington) +12:00 is now "NZST" with a DST (+13:00) counterpart,
NZDT.
parent eded7a03
......@@ -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:
......
......@@ -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
......
......@@ -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)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment