Use return instead of exit() in configure

tglsfdc · tglsfdc · commit fed9cf2cb9ef · 2021-12-12T14:54:37.000-05:00
Using exit() requires stdlib.h, which is not included. Use return instead. Also add return type for main(). This back-patches commit 1c0cf52 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/d0316012-ece7-7b7e-2d36-9c38cb77cb3b@enterprisedb.com
diff --git 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
@@ -250,8 +250,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
@@ -24588,8 +24588,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
@@ -24725,8 +24727,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
@@ -24829,8 +24833,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

Original file line number	Diff line number	Diff line change
`@@ -24588,8 +24588,10 @@ int does_int64_work()`
`24588`	`24588`	`return 0;`
`24589`	`24589`	`return 1;`
`24590`	`24590`	`}`
	`24591`	`+`
	`24592`	`+int`
`24591`	`24593`	`main() {`
`24592`		`- exit(! does_int64_work());`
	`24594`	`+ return (! does_int64_work());`
`24593`	`24595`	`}`
`24594`	`24596`	`_ACEOF`
`24595`	`24597`	`rm -f conftest$ac_exeext`
`@@ -24725,8 +24727,10 @@ int does_int64_work()`
`24725`	`24727`	`return 0;`
`24726`	`24728`	`return 1;`
`24727`	`24729`	`}`
	`24730`	`+`
	`24731`	`+int`
`24728`	`24732`	`main() {`
`24729`		`- exit(! does_int64_work());`
	`24733`	`+ return (! does_int64_work());`
`24730`	`24734`	`}`
`24731`	`24735`	`_ACEOF`
`24732`	`24736`	`rm -f conftest$ac_exeext`
`@@ -24829,8 +24833,10 @@ int does_int64_snprintf_work()`
`24829`	`24833`	`return 0; /* either multiply or snprintf is busted */`
`24830`	`24834`	`return 1;`
`24831`	`24835`	`}`
	`24836`	`+`
	`24837`	`+int`
`24832`	`24838`	`main() {`
`24833`		`- exit(! does_int64_snprintf_work());`
	`24839`	`+ return (! does_int64_snprintf_work());`
`24834`	`24840`	`}`
`24835`	`24841`	`_ACEOF`
`24836`	`24842`	`rm -f conftest$ac_exeext`