diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-06-07 22:39:45 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-06-07 22:39:45 +0000 |
| commit | a63d2168e900bba799a9baed3b24c7cf171e3e9d (patch) | |
| tree | 56b28dedb6d5a64a7e8aea2ba676b364a37c8554 /src/port/thread.c | |
| parent | 913661380382f268d2eec10f5c5e1ec1497fdd32 (diff) | |
| download | postgresql-a63d2168e900bba799a9baed3b24c7cf171e3e9d.tar.gz postgresql-a63d2168e900bba799a9baed3b24c7cf171e3e9d.zip | |
Fix strerror_r by checking return type from configure.
Diffstat (limited to 'src/port/thread.c')
| -rw-r--r-- | src/port/thread.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/port/thread.c b/src/port/thread.c index 474ef969457..47615962e74 100644 --- a/src/port/thread.c +++ b/src/port/thread.c @@ -7,7 +7,7 @@ * * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/port/thread.c,v 1.20 2004/04/23 18:15:55 momjian Exp $ + * $PostgreSQL: pgsql/src/port/thread.c,v 1.21 2004/06/07 22:39:45 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -70,12 +70,17 @@ pqStrerror(int errnum, char *strerrbuf, size_t buflen) { #if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_STRERROR_R) /* reentrant strerror_r is available */ - /* some early standards had strerror_r returning char * */ - strerror_r(errnum, strerrbuf, buflen); - return strerrbuf; - +#ifdef STRERROR_R_INT + /* SUSv3 version */ + if (strerror_r(errnum, strerrbuf, buflen) == 0) + return strerrbuf; + else + return NULL; +#else + /* GNU libc */ + return strerror_r(errnum, strerrbuf, buflen); +#endif #else - /* no strerror_r() available, just use strerror */ StrNCpy(strerrbuf, strerror(errnum), buflen); |