From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 27 Apr 2019 01:20:11 +0000 (-0400)
Subject: Portability fix for zic.c.
X-Git-Tag: REL9_4_22~11
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=1c61ec7bb14ee0c6064f54a2ddaaedc3537db581;p=postgresql.git

Portability fix for zic.c.

Missed an inttypes.h dependency in previous patch.  Per buildfarm.
---

diff --git a/src/timezone/README b/src/timezone/README
index f547d60d829..8fb26993274 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 169895c400d..76c78df0aab 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -607,7 +607,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;
@@ -615,9 +615,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;