diff options
author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2015-07-09 11:38:34 +0300 |
---|---|---|
committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2015-07-09 11:38:34 +0300 |
commit | 01051a9879fcd353eaf0d3788a911e774b52798c (patch) | |
tree | e4eb60e1c1d5b75d493141a79aa961f183c0b641 /src/backend/commands/aggregatecmds.c | |
parent | bfb4cf12abc14a99b29c9c3f768b0c7f568c262d (diff) | |
download | postgresql-01051a9879fcd353eaf0d3788a911e774b52798c.tar.gz postgresql-01051a9879fcd353eaf0d3788a911e774b52798c.zip |
Use AS_IF rather than plain shell "if" in pthread-check.
Autoconf generates additional code for the first AC_CHECK_HEADERS call in
the script. If the first call is within an if-block, the additional code is
put inside the if-block too, even though it is needed by subsequent
AC_CHECK_HEADERS checks and should always be executed. When I moved the
pthread-related checks earlier in the script, the pthread.h test inside
the block became the very first AC_CHECK_HEADERS call in the script,
triggering that problem.
To fix, use AS_IF instead of plain shell if. AS_IF knows about that issue,
and makes sure the additional code is always executed. To be completely
safe from this issue (and others), we should always be using AS_IF instead
of plain if, but that seems like excessive caution given that this is the
first time we have trouble like this. Plain if-then is more readable than
AS_IF.
This should fix compilation with --disable-thread-safety, and hopefully the
buildfarm failure on forgmouth, related to mingw standard headers, too.
I backpatched the previous fixes to 9.5, but it's starting to look like
these changes are too fiddly to backpatch, so commit this to master only,
and revert all the pthread-related configure changes in 9.5.
Diffstat (limited to 'src/backend/commands/aggregatecmds.c')
0 files changed, 0 insertions, 0 deletions