diff options
| author | Tom Lane | 2017-10-23 21:54:09 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-10-23 21:54:09 +0000 |
| commit | 876e076ebe074b63360d172f755ac5dea3d989b1 (patch) | |
| tree | 1d0e3726f93cb0bae85c341586cef064b25e483f /src/timezone/zic.c | |
| parent | d8a3be52f44d81637527adf1e86480c5c6fe31a5 (diff) | |
Sync our copy of the timezone library with IANA release tzcode2017c.
This is a trivial update containing only cosmetic changes. The point
is just to get back to being synced with an official release of tzcode,
rather than some ad-hoc point in their commit history, which is where
commit 47f849a3c left it.
Diffstat (limited to 'src/timezone/zic.c')
| -rw-r--r-- | src/timezone/zic.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/timezone/zic.c b/src/timezone/zic.c index 9b4a5891b30..bf017f1e91e 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -17,8 +17,8 @@ #include "private.h" #include "tzfile.h" -#define ZIC_VERSION_PRE_2013 '2' -#define ZIC_VERSION '3' +#define ZIC_VERSION_PRE_2013 '2' +#define ZIC_VERSION '3' #define PG_INT32_MIN (-0x7FFFFFFF-1) #define PG_INT32_MAX (0x7FFFFFFF) @@ -30,7 +30,7 @@ typedef int64 zic_t; #define ZIC_MAX PG_INT64_MAX #ifndef ZIC_MAX_ABBR_LEN_WO_WARN -#define ZIC_MAX_ABBR_LEN_WO_WARN 6 +#define ZIC_MAX_ABBR_LEN_WO_WARN 6 #endif /* !defined ZIC_MAX_ABBR_LEN_WO_WARN */ #ifndef WIN32 @@ -481,7 +481,7 @@ static void verror(const char *string, va_list args) { /* - * Match the format of "cc" to allow sh users to zic ... 2>&1 | error -t + * Match the format of "cc" to allow sh users to zic ... 2>&1 | error -t * "*" -v on BSD systems. */ if (filename) @@ -977,7 +977,7 @@ dolink(char const *fromfield, char const *tofield, bool staysymlink) } } -#define TIME_T_BITS_IN_FILE 64 +#define TIME_T_BITS_IN_FILE 64 static zic_t const min_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE); static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE); @@ -992,7 +992,7 @@ static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE); * Ade PAR, Aghanim N, Armitage-Caplan C et al. Planck 2013 results. * I. Overview of products and scientific results. * arXiv:1303.5062 2013-03-20 20:10:01 UTC - * <http://arxiv.org/pdf/1303.5062v1> [PDF] + * <https://arxiv.org/pdf/1303.5062v1> [PDF] * * Page 36, Table 9, row Age/Gyr, column Planck+WP+highL+BAO 68% limits * gives the value 13.798 plus-or-minus 0.037 billion years. @@ -1216,7 +1216,9 @@ infile(const char *name) /* nothing to do */ } else if (wantcont) + { wantcont = inzcont(fields, nfields); + } else { struct lookup const *line_codes |