mirror of https://github.com/postgres/postgres
Fix detection of the result type of strerror_r().
The method we've traditionally used, of redeclaring strerror_r() to
see if the compiler complains of inconsistent declarations, turns out
not to work reliably because some compilers only report a warning,
not an error. Amazingly, this has gone undetected for years, even
though it certainly breaks our detection of whether strerror_r
succeeded.
Let's instead test whether the compiler will take the result of
strerror_r() as a switch() argument. It's possible this won't
work universally either, but it's the best idea I could come up with
on the spur of the moment.
Back-patch of commit 751f532b9
. Buildfarm results indicate that only
icc-on-Linux actually has an issue here; perhaps the lack of field
reports indicates that people don't build PG for production that way.
Discussion: https://postgr.es/m/10877.1537993279@sss.pgh.pa.us
This commit is contained in:
parent
26b877d280
commit
e5baf8c27e
|
@ -105,23 +105,23 @@ fi
|
|||
|
||||
# PGAC_FUNC_STRERROR_R_INT
|
||||
# ---------------------------
|
||||
# Check if strerror_r() returns an int (SUSv3) rather than a char * (GNU libc)
|
||||
# If so, define STRERROR_R_INT
|
||||
# Check if strerror_r() returns int (POSIX) rather than char * (GNU libc).
|
||||
# If so, define STRERROR_R_INT.
|
||||
# The result is uncertain if strerror_r() isn't provided,
|
||||
# but we don't much care.
|
||||
AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
|
||||
[AC_CACHE_CHECK(whether strerror_r returns int,
|
||||
pgac_cv_func_strerror_r_int,
|
||||
[AC_TRY_COMPILE([#include <string.h>],
|
||||
[#ifndef _AIX
|
||||
int strerror_r(int, char *, size_t);
|
||||
#else
|
||||
/* Older AIX has 'int' for the third argument so we don't test the args. */
|
||||
int strerror_r();
|
||||
#endif],
|
||||
[char buf[100];
|
||||
switch (strerror_r(1, buf, sizeof(buf)))
|
||||
{ case 0: break; default: break; }
|
||||
],
|
||||
[pgac_cv_func_strerror_r_int=yes],
|
||||
[pgac_cv_func_strerror_r_int=no])])
|
||||
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
|
||||
AC_DEFINE(STRERROR_R_INT, 1,
|
||||
[Define to 1 if strerror_r() returns a int.])
|
||||
[Define to 1 if strerror_r() returns int.])
|
||||
fi
|
||||
])# PGAC_FUNC_STRERROR_R_INT
|
||||
|
||||
|
|
|
@ -13179,12 +13179,10 @@ else
|
|||
int
|
||||
main ()
|
||||
{
|
||||
#ifndef _AIX
|
||||
int strerror_r(int, char *, size_t);
|
||||
#else
|
||||
/* Older AIX has 'int' for the third argument so we don't test the args. */
|
||||
int strerror_r();
|
||||
#endif
|
||||
char buf[100];
|
||||
switch (strerror_r(1, buf, sizeof(buf)))
|
||||
{ case 0: break; default: break; }
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -779,7 +779,7 @@
|
|||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Define to 1 if strerror_r() returns a int. */
|
||||
/* Define to 1 if strerror_r() returns int. */
|
||||
#undef STRERROR_R_INT
|
||||
|
||||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||
|
|
|
@ -621,7 +621,7 @@
|
|||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#define STDC_HEADERS 1
|
||||
|
||||
/* Define to 1 if strerror_r() returns a int. */
|
||||
/* Define to 1 if strerror_r() returns int. */
|
||||
/* #undef STRERROR_R_INT */
|
||||
|
||||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||
|
|
Loading…
Reference in New Issue