Commit48f8fa9

committed

Portability fix for zic.c.

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

1 parenta967878 commit48f8fa9Copy full SHA for 48f8fa9

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,8 @@ to first run the tzcode source files through a sed filter like this:`
`117`	`117`	`-e 's/intmax_t/int64/g' \`
`118`	`118`	`-e 's/INT32_MIN/PG_INT32_MIN/g' \`
`119`	`119`	`-e 's/INT32_MAX/PG_INT32_MAX/g' \`
	`120`	`+ -e 's/INTMAX_MIN/PG_INT64_MIN/g' \`
	`121`	`+ -e 's/INTMAX_MAX/PG_INT64_MAX/g' \`
`120`	`122`	`-e 's/struct[ \t]+tm\b/struct pg_tm/g' \`
`121`	`123`	`-e 's/\btime_t\b/pg_time_t/g' \`
`122`	`124`	`-e 's/lineno/lineno_t/g' \`

Lines changed: 3 additions & 3 deletions

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;`

Comments

(0)