diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-15 17:09:54 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-02-15 17:09:54 -0500 |
| commit | dada4747a0eefc57cf82a27d856562b029813464 (patch) | |
| tree | 46289e7ca893d0f615e238e8cd8f16c2ee2747e2 /src | |
| parent | 38855bed5a09a2f005b88b73cf319b32332c4ad3 (diff) | |
| download | postgresql-dada4747a0eefc57cf82a27d856562b029813464.tar.gz postgresql-dada4747a0eefc57cf82a27d856562b029813464.zip | |
Fix unportable coding in DetermineSleepTime().
We should not assume that struct timeval.tv_sec is a long, because
it ain't necessarily. (POSIX says that it's a time_t, which might
well be 64 bits now or in the future; or for that matter might be
32 bits on machines with 64-bit longs.) Per buildfarm member panther.
Back-patch to 9.3 where the dubious coding was introduced.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 18a68f80db7..bcd37869067 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -1478,10 +1478,12 @@ DetermineSleepTime(struct timeval * timeout) if (next_wakeup != 0) { + long secs; int microsecs; TimestampDifference(GetCurrentTimestamp(), next_wakeup, - &timeout->tv_sec, µsecs); + &secs, µsecs); + timeout->tv_sec = secs; timeout->tv_usec = microsecs; /* Ensure we don't exceed one minute */ |