git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/timezone/README b/src/timezone/README

index f547d60d829ee272cd307b04247cecb5032bdf99..8fb2699327410bcb7d67737ab14dccc2b0e45ddd 100644 (file)

--- a/src/timezone/README

+++ b/src/timezone/README

-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 ab10165a267e2b8f46580a0a1584f409ccdec3a3..de8daaee5c9fb5d1c4455944fe3fbec3318ecbd6 100644 (file)

--- a/src/timezone/zic.c

+++ b/src/timezone/zic.c

{

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;

{

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;