mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-04 08:46:51 +02:00
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
e315bd7db9
commit
2855421ec7
@ -81,23 +81,23 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_,
|
|||||||
|
|
||||||
# PGAC_FUNC_STRERROR_R_INT
|
# PGAC_FUNC_STRERROR_R_INT
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
# Check if strerror_r() returns an int (SUSv3) rather than a char * (GNU libc)
|
# Check if strerror_r() returns int (POSIX) rather than char * (GNU libc).
|
||||||
# If so, define STRERROR_R_INT
|
# 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_DEFUN([PGAC_FUNC_STRERROR_R_INT],
|
||||||
[AC_CACHE_CHECK(whether strerror_r returns int,
|
[AC_CACHE_CHECK(whether strerror_r returns int,
|
||||||
pgac_cv_func_strerror_r_int,
|
pgac_cv_func_strerror_r_int,
|
||||||
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <string.h>],
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <string.h>],
|
||||||
[#ifndef _AIX
|
[[char buf[100];
|
||||||
int strerror_r(int, char *, size_t);
|
switch (strerror_r(1, buf, sizeof(buf)))
|
||||||
#else
|
{ case 0: break; default: break; }
|
||||||
/* Older AIX has 'int' for the third argument so we don't test the args. */
|
]])],
|
||||||
int strerror_r();
|
|
||||||
#endif])],
|
|
||||||
[pgac_cv_func_strerror_r_int=yes],
|
[pgac_cv_func_strerror_r_int=yes],
|
||||||
[pgac_cv_func_strerror_r_int=no])])
|
[pgac_cv_func_strerror_r_int=no])])
|
||||||
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
|
if test x"$pgac_cv_func_strerror_r_int" = xyes ; then
|
||||||
AC_DEFINE(STRERROR_R_INT, 1,
|
AC_DEFINE(STRERROR_R_INT, 1,
|
||||||
[Define to 1 if strerror_r() returns a int.])
|
[Define to 1 if strerror_r() returns int.])
|
||||||
fi
|
fi
|
||||||
])# PGAC_FUNC_STRERROR_R_INT
|
])# PGAC_FUNC_STRERROR_R_INT
|
||||||
|
|
||||||
|
10
configure
vendored
10
configure
vendored
@ -8583,12 +8583,10 @@ else
|
|||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
#ifndef _AIX
|
char buf[100];
|
||||||
int strerror_r(int, char *, size_t);
|
switch (strerror_r(1, buf, sizeof(buf)))
|
||||||
#else
|
{ case 0: break; default: break; }
|
||||||
/* Older AIX has 'int' for the third argument so we don't test the args. */
|
|
||||||
int strerror_r();
|
|
||||||
#endif
|
|
||||||
;
|
;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -816,7 +816,7 @@
|
|||||||
/* Define to 1 if you have the ANSI C header files. */
|
/* Define to 1 if you have the ANSI C header files. */
|
||||||
#undef STDC_HEADERS
|
#undef STDC_HEADERS
|
||||||
|
|
||||||
/* Define to 1 if strerror_r() returns a int. */
|
/* Define to 1 if strerror_r() returns int. */
|
||||||
#undef STRERROR_R_INT
|
#undef STRERROR_R_INT
|
||||||
|
|
||||||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||||
|
@ -620,7 +620,7 @@
|
|||||||
/* Define to 1 if you have the ANSI C header files. */
|
/* Define to 1 if you have the ANSI C header files. */
|
||||||
#define STDC_HEADERS 1
|
#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 */
|
/* #undef STRERROR_R_INT */
|
||||||
|
|
||||||
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
|
||||||
|
Loading…
Reference in New Issue
Block a user