diff options
| -rw-r--r-- | config/c-library.m4 | 18 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 2 | ||||
| -rw-r--r-- | src/include/pg_config.h.win32 | 2 |
4 files changed, 15 insertions, 17 deletions
diff --git a/config/c-library.m4 b/config/c-library.m4 index 4446a5b7194..c9067e51c87 100644 --- a/config/c-library.m4 +++ b/config/c-library.m4 @@ -82,23 +82,23 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_, # 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_COMPILE_IFELSE([AC_LANG_PROGRAM([#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 diff --git a/configure b/configure index 52308bcdb3d..2511b765a4d 100755 --- a/configure +++ b/configure @@ -10566,12 +10566,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; } diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index be9d5647c1e..2fae82ccc58 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -855,7 +855,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'. */ diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 26122990eed..abea7e8f9c9 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -676,7 +676,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'. */ |