In previous commit - change strerror() to STRERROR().

Use strerror() if available.

diff --git a/include/ac/errno.h b/include/ac/errno.h
index a7b10eb5d8a2aa6fc8fd785e44b48d36093c6e3b..26af4a57672874cd66acaf482c4e2cb2deb29b31 100644 (file)
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -28,9 +28,11 @@
        extern char     *sys_errlist[];
 #endif
 
-#ifndef HAVE_STRERROR
-#define        strerror(err) \
-       (err) > -1 && (err) < sys_nerr ? sys_errlist[(err)] : "unknown"
+#ifdef HAVE_STRERROR
+#define        STRERROR(err)   strerror(err)
+#else
+#define        STRERROR(err) \
+       ((err) > -1 && (err) < sys_nerr ? sys_errlist[(err)] : "unknown")
 #endif
 
 extern char* strerror_r();

diff --git a/include/ac/socket.h b/include/ac/socket.h
index b929dd80c973832ef884605c45c1dcc1cc1bbda0..48bb031a8c6ad32b0ba7224918df340510e81d81 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -97,7 +97,7 @@
 #else
 #      define tcp_close( s )           close( s )
 #      define sock_errno()     errno
-#      define sock_errstr()    strerror(errno)
+#      define sock_errstr()    STRERROR(errno)
 #endif /* MACOS */
 
 #ifndef ioctl_t

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 972a5d0213ba762fabd92f7898322b3ead9b97b6..b554ede05a61921369c4dbca78d5a0ac68f2b4b6 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -921,7 +921,7 @@ connection_input(
 
                Debug( LDAP_DEBUG_TRACE,
                        "ber_get_next on fd %d failed errno=%d (%s)\n",
-                       ber_pvt_sb_get_desc( conn->c_sb ), err, strerror(err) );
+                       ber_pvt_sb_get_desc( conn->c_sb ), err, STRERROR(err) );
                Debug( LDAP_DEBUG_TRACE,
                        "\t*** got %ld of %lu so far\n",
                        (long)(conn->c_currentber->ber_rwptr - conn->c_currentber->ber_buf),

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 563e83aa35b7a8c44ae53acdf265803279f03500..242b72e2d8ca3e523ade9aa03cfa5b7443e1dfcb 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -186,7 +186,7 @@ static long send_ldap_ber(
                 */
 
                Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
-                   err, strerror(err) );
+                   err, STRERROR(err) );
 
                if ( err != EWOULDBLOCK && err != EAGAIN ) {
                        connection_closing( conn );