diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-04-26 21:20:11 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-04-26 21:20:55 -0400 |
| commit | 48f8fa9ce0f9799c8ae8bcd23c498fe002d5496d (patch) | |
| tree | 2856966cc216cbec7dbc1037041b212d63804a2c /src/timezone | |
| parent | a967878414f906a7f88842424c667a5ac31b9625 (diff) | |
| download | postgresql-48f8fa9ce0f9799c8ae8bcd23c498fe002d5496d.tar.gz | |
Portability fix for zic.c.
Missed an inttypes.h dependency in previous patch. Per buildfarm.
Diffstat (limited to 'src/timezone')
| -rw-r--r-- | src/timezone/README | 2 | ||||
| -rw-r--r-- | src/timezone/zic.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/timezone/README b/src/timezone/README index f547d60d82..8fb2699327 100644 --- a/src/timezone/README +++ b/src/timezone/README @@ -117,6 +117,8 @@ to first run the tzcode source files through a sed filter like this: -e 's/intmax_t/int64/g' \ -e 's/INT32_MIN/PG_INT32_MIN/g' \ -e 's/INT32_MAX/PG_INT32_MAX/g' \ + -e 's/INTMAX_MIN/PG_INT64_MIN/g' \ + -e 's/INTMAX_MAX/PG_INT64_MAX/g' \ -e 's/struct[ \t]+tm\b/struct pg_tm/g' \ -e 's/\btime_t\b/pg_time_t/g' \ -e 's/lineno/lineno_t/g' \ diff --git a/src/timezone/zic.c b/src/timezone/zic.c index ab10165a26..de8daaee5c 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -599,7 +599,7 @@ timerange_option(char *timerange) { errno = 0; lo = strtoimax(timerange + 1, &lo_end, 10); - if (lo_end == timerange + 1 || (lo == INTMAX_MAX && errno == ERANGE)) + if (lo_end == timerange + 1 || (lo == PG_INT64_MAX && errno == ERANGE)) return false; } hi_end = lo_end; @@ -607,9 +607,9 @@ timerange_option(char *timerange) { errno = 0; hi = strtoimax(lo_end + 2, &hi_end, 10); - if (hi_end == lo_end + 2 || hi == INTMAX_MIN) + if (hi_end == lo_end + 2 || hi == PG_INT64_MIN) return false; - hi -= !(hi == INTMAX_MAX && errno == ERANGE); + hi -= !(hi == PG_INT64_MAX && errno == ERANGE); } if (*hi_end || hi < lo || max_time < lo || hi < min_time) return false; |