diff options
| author | Rich Felker <dalias@aerifal.cx> | 2020-11-22 17:00:01 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2020-11-22 17:00:01 -0500 |
| commit | 585a0a78f96c6968a44b32d07d7bb5c4abf75655 (patch) | |
| tree | cceaa9147862bbbbc291fb6633096623ec741ac9 | |
| parent | debbddf7c86dfe7fb2f44f057123ccfd950ff555 (diff) | |
| download | musl-585a0a78f96c6968a44b32d07d7bb5c4abf75655.tar.gz musl-585a0a78f96c6968a44b32d07d7bb5c4abf75655.tar.xz musl-585a0a78f96c6968a44b32d07d7bb5c4abf75655.zip | |
explicitly prefer 64-bit/v2 zoneinfo tables
since commit 38143339646a4ccce8afe298c34467767c899f51, the condition sizeof(time_t) > 4 is always true, so there is no functional change being made here. but semantically, the 64-bit tables should always be preferred now, because upstream zic (zoneinfo compiler) has quietly switched to emitting empty 32-bit tables by default, and the resulting backwards-incompatible zoneinfo files will be encountered in the wild.
| -rw-r--r-- | src/time/__tz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/time/__tz.c b/src/time/__tz.c index dd2c42c0..2eb6ab4e 100644 --- a/src/time/__tz.c +++ b/src/time/__tz.c @@ -185,7 +185,7 @@ static void do_tzset() zi = map; if (map) { int scale = 2; - if (sizeof(time_t) > 4 && map[4]=='2') { + if (map[4]=='2') { size_t skip = zi_dotprod(zi+20, VEC(1,1,8,5,6,1), 6); trans = zi+skip+44+44; scale++; |