Portability fix for zic.c.

tglsfdc · tglsfdc · commit 48f8fa9ce0f9 · 2019-04-26T21:20:55.000-04:00
Missed an inttypes.h dependency in previous patch.  Per buildfarm.
diff --git 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
@@ -599,17 +599,17 @@ 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;
 	if (lo_end[0] == '/' && lo_end[1] == '@')
 	{
 		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;

Original file line number	Diff line number	Diff line change
`@@ -599,17 +599,17 @@ timerange_option(char *timerange)`
`599`	`599`	`{`
`600`	`600`	`errno = 0;`
`601`	`601`	`lo = strtoimax(timerange + 1, &lo_end, 10);`
`602`		`- if (lo_end == timerange + 1 \|\| (lo == INTMAX_MAX && errno == ERANGE))`
	`602`	`+ if (lo_end == timerange + 1 \|\| (lo == PG_INT64_MAX && errno == ERANGE))`
`603`	`603`	`return false;`
`604`	`604`	`}`
`605`	`605`	`hi_end = lo_end;`
`606`	`606`	`if (lo_end[0] == '/' && lo_end[1] == '@')`
`607`	`607`	`{`
`608`	`608`	`errno = 0;`
`609`	`609`	`hi = strtoimax(lo_end + 2, &hi_end, 10);`
`610`		`- if (hi_end == lo_end + 2 \|\| hi == INTMAX_MIN)`
	`610`	`+ if (hi_end == lo_end + 2 \|\| hi == PG_INT64_MIN)`
`611`	`611`	`return false;`
`612`		`- hi -= !(hi == INTMAX_MAX && errno == ERANGE);`
	`612`	`+ hi -= !(hi == PG_INT64_MAX && errno == ERANGE);`
`613`	`613`	`}`
`614`	`614`	`if (*hi_end \|\| hi < lo \|\| max_time < lo \|\| hi < min_time)`
`615`	`615`	`return false;`