diff options
| author | Tom Lane | 2021-12-12 19:54:32 +0000 |
|---|---|---|
| committer | Tom Lane | 2021-12-12 19:54:32 +0000 |
| commit | f24374bce687a2279f9befd3a1da72bd9ca7d1bd (patch) | |
| tree | f976f8c2cdc5fe08b70a6a19c03834d812d1d06d | |
| parent | c10bb239d29017ba66eca88a24b84a1d4db36a6c (diff) | |
Use return instead of exit() in configure
Using exit() requires stdlib.h, which is not included. Use return
instead. Also add return type for main().
This back-patches commit 1c0cf52b3 into out-of-support branches,
pursuant to a newly-established project policy that we'll try to keep
out-of-support branches buildable on modern platforms for at least
ten major releases back, ensuring people can test pg_dump and psql
compatibility against servers that far back. With the current
development branch being v15, that works out to keeping 9.2 and up
buildable as of today.
This fix is needed to get through 'configure' when using recent
macOS (and possibly other clang-based toolchains). It seems to
be sufficient to get through 'check-world', although there are
annoyances such as compiler warnings, which will be dealt with
separately.
Original patch by Peter Eisentraut
Discussion: https://postgr.es/m/[email protected]
| -rw-r--r-- | config/c-compiler.m4 | 4 | ||||
| -rw-r--r-- | config/c-library.m4 | 4 | ||||
| -rwxr-xr-x | configure | 12 |
3 files changed, 15 insertions, 5 deletions
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4 index 802f5539d34..60ad77c88ad 100644 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@ -84,8 +84,10 @@ int does_int64_work() return 0; return 1; } + +int main() { - exit(! does_int64_work()); + return (! does_int64_work()); }], [Ac_cachevar=yes], [Ac_cachevar=no], diff --git a/config/c-library.m4 b/config/c-library.m4 index 949f3a5e341..c8ecbb6fa77 100644 --- a/config/c-library.m4 +++ b/config/c-library.m4 @@ -251,8 +251,10 @@ int does_int64_snprintf_work() return 0; /* either multiply or snprintf is busted */ return 1; } + +int main() { - exit(! does_int64_snprintf_work()); + return (! does_int64_snprintf_work()); }], [pgac_cv_snprintf_long_long_int_format=$pgac_format; break], [], diff --git a/configure b/configure index 0f2d36e7fa8..b2ec267e5cf 100755 --- a/configure +++ b/configure @@ -25530,8 +25530,10 @@ int does_int64_work() return 0; return 1; } + +int main() { - exit(! does_int64_work()); + return (! does_int64_work()); } _ACEOF rm -f conftest$ac_exeext @@ -25669,8 +25671,10 @@ int does_int64_work() return 0; return 1; } + +int main() { - exit(! does_int64_work()); + return (! does_int64_work()); } _ACEOF rm -f conftest$ac_exeext @@ -25780,8 +25784,10 @@ int does_int64_snprintf_work() return 0; /* either multiply or snprintf is busted */ return 1; } + +int main() { - exit(! does_int64_snprintf_work()); + return (! does_int64_snprintf_work()); } _ACEOF rm -f conftest$ac_exeext |