Mon Oct 19 19:25:40 UTC 2009 Olli Savia <ops@iki.fi>

46 files changed, 51 insertions, 112 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ce8bff6e15a..14e64c65ccc 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,54 @@
+Mon Oct 19 19:25:40 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/README:
+        * ace/config-aix-5.x.h:
+        * ace/config-cray.h:
+        * ace/config-cygwin32.h:
+        * ace/config-freebsd.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-integritySCA.h:
+        * ace/config-irix6.x-common.h:
+        * ace/config-linux-common.h:
+        * ace/config-lynxos.h:
+        * ace/config-macosx-leopard.h:
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+        * ace/config-macosx.h:
+        * ace/config-mvs.h:
+        * ace/config-netbsd.h:
+        * ace/config-openbsd.h:
+        * ace/config-openvms.h:
+        * ace/config-qnx-neutrino.h:
+        * ace/config-qnx-rtp-62x.h:
+        * ace/config-qnx-rtp-pre62x.h:
+        * ace/config-rtems.h:
+        * ace/config-sco-5.0.0.h:
+        * ace/config-sunos5.4-g++.h:
+        * ace/config-sunos5.4-sunc++-4.x.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-tandem-nsk-mips-v2.h:
+        * ace/config-tandem-nsk-mips-v3.h:
+        * ace/config-tandem.h:
+        * ace/config-tru64.h:
+        * ace/config-unixware-7.1.0.h:
+        * ace/config-unixware-7.1.0.udk.h:
+        * ace/config-vxworks6.4.h:
+        * ace/config-win32-borland.h:
+        * ace/config-win32-cegcc.h:
+        * ace/config-win32-dmc.h:
+        * ace/config-win32-ghs.h:
+        * ace/config-win32-interix.h:
+        * ace/config-win32-mingw.h:
+        * ace/config-win32-msvc-10.h:
+        * ace/config-win32-msvc-7.h:
+        * ace/config-win32-msvc-8.h:
+        * ace/config-win32-msvc-9.h:
+        * ace/os_include/os_string.h:
+        * configure.ac:
+
+          Cleaned up strerror mess. We had both ACE_HAS_STRERROR and
+          ACE_LACKS_STREROR. ACE_HAS_STRERROR is no longer in use.
+
 Mon Oct 19 18:18:37 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * ace/config-linux-common.h:
diff --git a/ACE/ace/README b/ACE/ace/README
index 8494402fff3..c772a1f70f6 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -607,7 +607,6 @@ ACE_HAS_WCSDUP_EMULATION                Use ACE's wcsdup() emulation (even
 ACE_HAS_STRNLEN                         Platform supports strnlen(3).
 ACE_HAS_STREAMS                         Platform supports STREAMS
 ACE_HAS_STREAM_PIPES                    Platform supports STREAM pipes
-ACE_HAS_STRERROR                        Compiler/platform supports strerror ()
 ACE_HAS_STRICT                          Use the STRICT compilation mode on Win32.
 ACE_HAS_STRING_CLASS                    Platform/Compiler supports a
                                         String class (e.g., GNU or
@@ -1557,25 +1556,6 @@ ACE_HAS_STREAM_PIPES:
      No sysV.4 streams.
 
 
-ACE_HAS_STRERROR:
------------------
-
-  Used in:
-     ace/OS.h
-
-  Notes:
-     if not defined, does a:
-     #define strerror(err) sys_errlist[err]
-
-  Solaris:
-     /usr/include/string.h
-
-  HPUX:
-     set it.
-     in /usr/include/sys/errno.h and string.h
-     extern char *strerror (int);
-
-
 ACE_HAS_SVR4_DYNAMIC_LINKING:
 -----------------------------
 
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 16e75fa4d45..2151c32fb02 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -209,9 +209,6 @@
 #define ACE_HAS_STREAMS
 // #define ACE_HAS_STREAM_PIPES
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // AIX bzero()
 #define ACE_HAS_STRINGS
 
diff --git a/ACE/ace/config-cray.h b/ACE/ace/config-cray.h
index 20d231622c2..64a187d473e 100644
--- a/ACE/ace/config-cray.h
+++ b/ACE/ace/config-cray.h
@@ -98,8 +98,6 @@
 
 #define ACE_HAS_MSG
 
-#define ACE_HAS_STRERROR
-
 #define ACE_HAS_GPERF
 
 // Special modifications that apply to UNICOS/mk
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h
index 31202e57a2f..53a1ad4192d 100644
--- a/ACE/ace/config-cygwin32.h
+++ b/ACE/ace/config-cygwin32.h
@@ -112,9 +112,6 @@
 
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 #define ACE_HAS_STRSIGNAL
 
 // Compiler supports the ssize_t typedef.
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index 69c408168ef..7dfa5a07b34 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -77,7 +77,6 @@
 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_SVR4_SIGNAL_T
 #define ACE_HAS_SYSCTL
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 54db1735b53..426fde5ddf7 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -292,9 +292,6 @@
 // Platform supports ucontext_t (which is used in the extended signal API).
 #define ACE_HAS_UCONTEXT_T
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Platform/compiler supports void * as second parameter to gettimeofday().
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h
index 1669c3028ed..b1ed54248f2 100644
--- a/ACE/ace/config-integritySCA.h
+++ b/ACE/ace/config-integritySCA.h
@@ -47,7 +47,6 @@
 
 /***** ANSI defines *****/
 #define ACE_LACKS_TEMPNAM /* believe it or not, this is ANSI C */
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_PUTENV_PROTOTYPE
 
 #define ACE_LACKS_SENDMSG
diff --git a/ACE/ace/config-irix6.x-common.h b/ACE/ace/config-irix6.x-common.h
index 7664ce4bf8e..394b2cf16f0 100644
--- a/ACE/ace/config-irix6.x-common.h
+++ b/ACE/ace/config-irix6.x-common.h
@@ -119,9 +119,6 @@
 // Platform supports STREAMS.
 #define ACE_HAS_STREAMS
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform supports struct strbuf.
 #define ACE_HAS_STRBUF_T
 
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 64574b42200..1b1c6a03c06 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -344,9 +344,6 @@
 
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Don't define _XOPEN_SOURCE in ACE to make strptime() prototype
 // visible.  ACE shouldn't depend on feature test macros to make
 // prototypes visible.
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index dd6fa1d7f19..de7d2029ae1 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -84,7 +84,6 @@
 #define ACE_HAS_SOCKADDR_MSG_NAME
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STREAMS
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_STRING_CLASS
 #define ACE_HAS_SYSCTL
diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h
index fc345c78b38..8c82e559e63 100644
--- a/ACE/ace/config-macosx-leopard.h
+++ b/ACE/ace/config-macosx-leopard.h
@@ -142,9 +142,6 @@
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform provides the sockio.h file.
 #define ACE_HAS_SYS_SOCKIO_H
 
diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h
index 0508891d426..5075f385fb8 100644
--- a/ACE/ace/config-macosx-panther.h
+++ b/ACE/ace/config-macosx-panther.h
@@ -107,9 +107,6 @@
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform provides the sockio.h file.
 #define ACE_HAS_SYS_SOCKIO_H
 
diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h
index 33a530fd5a7..45a1d631f84 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -132,9 +132,6 @@
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform provides the sockio.h file.
 #define ACE_HAS_SYS_SOCKIO_H
 
diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h
index 5c3c27546fa..5efe7916234 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -109,9 +109,6 @@
 // Compiler supports the ssize_t typedef.
 #define ACE_HAS_SSIZE_T
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform provides the sockio.h file.
 #define ACE_HAS_SYS_SOCKIO_H
 
diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h
index 785f94209d2..719d30dcc46 100644
--- a/ACE/ace/config-mvs.h
+++ b/ACE/ace/config-mvs.h
@@ -66,7 +66,6 @@
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRBUF_T
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SYSV_IPC
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 0b526e3dbe6..6730f0814da 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -72,7 +72,6 @@
 #define ACE_HAS_SSIZE_T 1
 #define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #define ACE_HAS_STDEXCEPT_NO_H 1
-#define ACE_HAS_STRERROR 1
 #define ACE_HAS_STRINGS 1
 #define ACE_HAS_STRING_CLASS 1
 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index c8b34a363ed..b5d2446fb17 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -118,7 +118,6 @@
 #define ACE_HAS_SOCKADDR_MSG_NAME
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_STRING_CLASS
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 29b083e9c42..2f7f514ad78 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -113,7 +113,6 @@
 #define ACE_HAS_SIGISMEMBER_BUG
 #define ACE_HAS_STRNLEN 1
 #define ACE_HAS_STREAMS 1
-#define ACE_HAS_STRERROR 1
 #define ACE_HAS_UALARM 1
 #define ACE_HAS_VOIDPTR_MMAP 1
 #define ACE_HAS_VOIDPTR_SOCKOPT 1
diff --git a/ACE/ace/config-qnx-neutrino.h b/ACE/ace/config-qnx-neutrino.h
index 3b51403b53d..faa9cd7b94a 100644
--- a/ACE/ace/config-qnx-neutrino.h
+++ b/ACE/ace/config-qnx-neutrino.h
@@ -77,7 +77,6 @@
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SVR4_GETTIMEOFDAY
 #define ACE_HAS_TERMIOS
diff --git a/ACE/ace/config-qnx-rtp-62x.h b/ACE/ace/config-qnx-rtp-62x.h
index 11699c02b85..c4b47749a38 100644
--- a/ACE/ace/config-qnx-rtp-62x.h
+++ b/ACE/ace/config-qnx-rtp-62x.h
@@ -54,7 +54,6 @@
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_SVR4_GETTIMEOFDAY
diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h
index 0560a0c8057..57db93435df 100644
--- a/ACE/ace/config-qnx-rtp-pre62x.h
+++ b/ACE/ace/config-qnx-rtp-pre62x.h
@@ -52,7 +52,6 @@
 // #define ACE_HAS_SIZET_SOCKET_LEN
 #define ACE_HAS_SOCKLEN_T
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRINGS
 #define ACE_HAS_SVR4_GETTIMEOFDAY
 #define ACE_HAS_TERMIOS
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index a7f2d2622d2..8bb8342802b 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -98,7 +98,6 @@
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGSUSPEND
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_HAS_SYS_ERRLIST
 #define ACE_HAS_SYS_FILIO_H
diff --git a/ACE/ace/config-sco-5.0.0.h b/ACE/ace/config-sco-5.0.0.h
index 5fcc055754c..53d9f96fa7e 100644
--- a/ACE/ace/config-sco-5.0.0.h
+++ b/ACE/ace/config-sco-5.0.0.h
@@ -62,9 +62,6 @@
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // Note, this only works if the flag is set above!
diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h
index f94557c2ac5..931ac376113 100644
--- a/ACE/ace/config-sunos5.4-g++.h
+++ b/ACE/ace/config-sunos5.4-g++.h
@@ -106,9 +106,6 @@
 // Platform supports STREAM pipes.
 #define ACE_HAS_STREAM_PIPES
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform supports struct strbuf.
 #define ACE_HAS_STRBUF_T
 
diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h
index f2642d47611..ba4cae3f75c 100644
--- a/ACE/ace/config-sunos5.4-sunc++-4.x.h
+++ b/ACE/ace/config-sunos5.4-sunc++-4.x.h
@@ -100,9 +100,6 @@
 // Platform supports STREAM pipes.
 #define ACE_HAS_STREAM_PIPES
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform supports struct strbuf.
 #define ACE_HAS_STRBUF_T
 
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index b93395ac4f3..494d400efcf 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -278,9 +278,6 @@
 // Platform supports STREAM pipes.
 #define ACE_HAS_STREAM_PIPES
 
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
 // Compiler/platform supports struct strbuf.
 #define ACE_HAS_STRBUF_T
 
diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h
index 5e906d82826..ad3a8f92180 100644
--- a/ACE/ace/config-tandem-nsk-mips-v2.h
+++ b/ACE/ace/config-tandem-nsk-mips-v2.h
@@ -185,9 +185,6 @@ typedef enum CMA_T_SCHED_POLICY {
 // to make some ACE modifications.]
 //#define ACE_HAS_REGEX
 
-// Compiler/platform supports strerror ()
-#define ACE_HAS_STRERROR
-
 // Platform doesn't have truncate()
 #define ACE_LACKS_TRUNCATE
 
diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h
index 05b0107b7b6..793c3c2d6d1 100644
--- a/ACE/ace/config-tandem-nsk-mips-v3.h
+++ b/ACE/ace/config-tandem-nsk-mips-v3.h
@@ -186,9 +186,6 @@ typedef enum CMA_T_SCHED_POLICY {
 // to make some ACE modifications.]
 //#define ACE_HAS_REGEX
 
-// Compiler/platform supports strerror ()
-#define ACE_HAS_STRERROR
-
 // Platform doesn't have truncate()
 #define ACE_LACKS_TRUNCATE
 
diff --git a/ACE/ace/config-tandem.h b/ACE/ace/config-tandem.h
index 896405094c9..bb52027e094 100644
--- a/ACE/ace/config-tandem.h
+++ b/ACE/ace/config-tandem.h
@@ -111,9 +111,6 @@
 #define ACE_HAS_STREAM_PIPES
 //Platform supports STREAM pipes
 
-//Compiler/platform supports strerror ()
-#define ACE_HAS_STRERROR
-
 //Compiler/platform supports struct strbuf
 #define ACE_HAS_STRBUF_T
 
diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h
index 707196475bd..21270f2e122 100644
--- a/ACE/ace/config-tru64.h
+++ b/ACE/ace/config-tru64.h
@@ -102,7 +102,6 @@
 #define ACE_HAS_SSIZE_T
 #define ACE_HAS_STRBUF_T
 #define ACE_HAS_STREAMS
-#define ACE_HAS_STRERROR
 #define ACE_HAS_STRPTIME
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
 #define ACE_HAS_SVR4_SIGNAL_T
diff --git a/ACE/ace/config-unixware-7.1.0.h b/ACE/ace/config-unixware-7.1.0.h
index 61fda550ddf..072814c513e 100644
--- a/ACE/ace/config-unixware-7.1.0.h
+++ b/ACE/ace/config-unixware-7.1.0.h
@@ -229,9 +229,6 @@
 /* Platform supports STREAM pipes */
 #define ACE_HAS_STREAM_PIPES 1
 
-/* Compiler/platform supports strerror () */
-#define ACE_HAS_STRERROR 1
-
 /* Platform/Compiler supports a String class (e.g., GNU or Win32). */
 #define ACE_HAS_STRING_CLASS 1
 
diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h
index be98a631661..350f6af8021 100644
--- a/ACE/ace/config-unixware-7.1.0.udk.h
+++ b/ACE/ace/config-unixware-7.1.0.udk.h
@@ -269,9 +269,6 @@
 /* Platform supports STREAM pipes */
 #define ACE_HAS_STREAM_PIPES
 
-/* Compiler/platform supports strerror () */
-#define ACE_HAS_STRERROR
-
 /* Platform/Compiler supports a String class (e.g., GNU or Win32). */
 #define ACE_HAS_STRING_CLASS
 
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index dec2bd369b0..dae90277785 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -113,7 +113,6 @@
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SOCKADDR_IN_SIN_LEN
 #define ACE_HAS_SOCKADDR_IN6_SIN6_LEN
-#define ACE_HAS_STRERROR
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
 #define ACE_LACKS_ALPHASORT
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 2f2f3c69e09..e4f26d2ebd6 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -114,7 +114,6 @@
 # define ACE_HAS_SIG_ATOMIC_T
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_STDCPP_STL_INCLUDES 1
-# define ACE_HAS_STRERROR
 # define ACE_HAS_STRING_CLASS 1
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
 # define ACE_HAS_USER_MODE_MASKS 1
diff --git a/ACE/ace/config-win32-cegcc.h b/ACE/ace/config-win32-cegcc.h
index 1d08ff1b075..ceff1b9dac0 100644
--- a/ACE/ace/config-win32-cegcc.h
+++ b/ACE/ace/config-win32-cegcc.h
@@ -61,7 +61,6 @@
 #define ACE_LACKS_NETINET_TCP_H
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_STRPTIME
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_REGEX_H
 #define ACE_LACKS_SYS_MSG_H
diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h
index 2c6a45ceaee..aca42dffc88 100644
--- a/ACE/ace/config-win32-dmc.h
+++ b/ACE/ace/config-win32-dmc.h
@@ -54,7 +54,6 @@
 # define ACE_HAS_SIG_ATOMIC_T 1
 # define ACE_HAS_STANDARD_CPP_LIBRARY 0
 # define ACE_HAS_STDCPP_STL_INCLUDES 1
-# define ACE_HAS_STRERROR 1
 # define ACE_HAS_STRING_CLASS 1
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
 # define ACE_HAS_USER_MODE_MASKS 1
diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h
index 2467d4845c4..efd0be0842f 100644
--- a/ACE/ace/config-win32-ghs.h
+++ b/ACE/ace/config-win32-ghs.h
@@ -62,7 +62,6 @@
 # define ACE_HAS_SIG_ATOMIC_T 1
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
 # define ACE_HAS_STDCPP_STL_INCLUDES 1
-# define ACE_HAS_STRERROR 1
 # define ACE_HAS_STRING_CLASS 1
 # define ACE_HAS_TEMPLATE_TYPEDEFS 1
 # define ACE_HAS_USER_MODE_MASKS 1
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index 19cb586aa8f..e8cf2c01cb8 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -65,7 +65,6 @@
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SEMUN
 #define ACE_HAS_SSIZE_T
-#define ACE_HAS_STRERROR
 #define ACE_HAS_SVR4_GETTIMEOFDAY
 #define ACE_HAS_UALARM
 #define ACE_HAS_TERMIOS
diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h
index cb710b013e9..12a2b6bea42 100644
--- a/ACE/ace/config-win32-mingw.h
+++ b/ACE/ace/config-win32-mingw.h
@@ -62,7 +62,6 @@
 #define ACE_LACKS_NETINET_TCP_H
 #define ACE_LACKS_STRRECVFD
 #define ACE_LACKS_STRPTIME
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_POLL_H
 #define ACE_LACKS_REGEX_H
 #define ACE_LACKS_SYS_MSG_H
diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h
index ec87a53a6f1..35ca0b5cf2b 100644
--- a/ACE/ace/config-win32-msvc-10.h
+++ b/ACE/ace/config-win32-msvc-10.h
@@ -62,7 +62,6 @@
 #    define ACE_HAS_SIG_ATOMIC_T
 #  endif /* !Win CE 6.0 or less */
 
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_STRPTIME
 
 // Evaluate this with a WinCE build; maybe things have improved since VC8.
diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h
index 9d1ac7b907b..4c6a153a63d 100644
--- a/ACE/ace/config-win32-msvc-7.h
+++ b/ACE/ace/config-win32-msvc-7.h
@@ -50,7 +50,6 @@
 #define ACE_HAS_EXCEPTIONS
 #endif /* ACE_HAS_WINCE */
 
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_STRPTIME
 
 #define ACE_HAS_SIG_ATOMIC_T
diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h
index 03bc500dcc0..2fde03f045a 100644
--- a/ACE/ace/config-win32-msvc-8.h
+++ b/ACE/ace/config-win32-msvc-8.h
@@ -67,7 +67,6 @@
 #    define ACE_HAS_SIG_ATOMIC_T
 #  endif /* !Win CE 6.0 or less */
 
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_STRPTIME
 
 #if !defined (ACE_HAS_WINCE)
diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h
index aaa56dc3935..c4a2742954c 100644
--- a/ACE/ace/config-win32-msvc-9.h
+++ b/ACE/ace/config-win32-msvc-9.h
@@ -62,7 +62,6 @@
 #    define ACE_HAS_SIG_ATOMIC_T
 #  endif /* !Win CE 6.0 or less */
 
-#define ACE_HAS_STRERROR
 #define ACE_LACKS_STRPTIME
 
 // Evaluate this with a WinCE build; maybe things have improved since VC8.
diff --git a/ACE/ace/os_include/os_string.h b/ACE/ace/os_include/os_string.h
index 7c7f63de930..994d9940940 100644
--- a/ACE/ace/os_include/os_string.h
+++ b/ACE/ace/os_include/os_string.h
@@ -45,16 +45,6 @@ extern "C"
 {
 #endif /* __cplusplus */
 
-  // this looks fishy... dhinton
-#if !defined (ACE_HAS_STRERROR)
-# if defined (ACE_HAS_SYS_ERRLIST)
-    extern char *sys_errlist[];
-#   define strerror(err) sys_errlist[err]
-# else
-#   define strerror(err) "strerror is unsupported"
-# endif /* ACE_HAS_SYS_ERRLIST */
-#endif /* !ACE_HAS_STRERROR */
-
 #if defined (ACE_LACKS_STRTOK_R_PROTOTYPE) && !defined (_POSIX_SOURCE)
   char *strtok_r (char *s, const char *delim, char **save_ptr);
 #endif  /* ACE_LACKS_STRTOK_R_PROTOTYPE */
diff --git a/ACE/configure.ac b/ACE/configure.ac
index 286b8f866ab..3e4f9d4effe 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -3314,9 +3314,6 @@ fi
 
 ACE_CHECK_LACKS_FUNCS(strchr)
 
-# believe it or not, both ACE_LACKS_STRERROR and ACE_HAS_STRERROR
-# feature test macros are currently used.
-ACE_CHECK_HAS_FUNCS(strerror)
 ACE_CHECK_LACKS_FUNCS(strerror)
 
 ACE_CHECK_LACKS_FUNCS(strftime)