Thu Oct 29 21:04:27 UTC 2009 Olli Savia <ops@iki.fi>

17 files changed, 23 insertions, 37 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b1f26dd2547..f3960d5c1ba 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,23 @@
+Thu Oct 29 21:04:27 UTC 2009  Olli Savia  <ops@iki.fi>
+
+        * ace/README:
+        * ace/config-aix-5.x.h:
+        * ace/config-irix6.x-g++.h:
+        * ace/config-lynxos.h:
+        * ace/config-netbsd.h:
+        * ace/config-openbsd.h:
+        * ace/config-sco-5.0.0-nothread.h:
+        * ace/config-sunos5.4-g++.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-tru64.h:
+        * ace/config-unixware-7.1.0.h:
+        * ace/config-win32-borland.h:
+        * ace/config-win32-dmc.h:
+        * ace/config-win32-ghs.h:
+        * configure.ac:
+        * m4/config_h.m4:
+          Removed references to ACE_HAS_GNU_CSTRING_H.
+
 Thu Oct 29 20:30:35 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * ace/OS_NS_stdlib.h:
diff --git a/ACE/ace/README b/ACE/ace/README
index 1f5a9e3b3d3..02fac245d3f 100644
--- a/ACE/ace/README
+++ b/ACE/ace/README
@@ -335,9 +335,6 @@ ACE_HAS_GETRUSAGE_PROTOTYPE             Platform has a getrusage ()
                                         prototype in sys/resource.h
                                         that differs from the one in
                                         ace/OS.i.
-ACE_HAS_GNU_CSTRING_H                   Denotes that GNU has cstring.h
-                                        as standard which redefines
-                                        memchr()
 ACE_HAS_GPERF                           The GPERF utility is compiled
                                         for this platform
 ACE_HAS_GETIFADDRS                      This platform has ifaddrs.h and
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 5cc24012f37..006aca64857 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -93,8 +93,7 @@
 # define ACE_HAS_STRING_CLASS
 
 # include "ace/config-g++-common.h"
-  // Denotes that GNU has cstring.h as standard, to redefine memchr().
-# define ACE_HAS_GNU_CSTRING_H
+
 # define ACE_HAS_SSIZE_T
 
 # if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ == 0))
diff --git a/ACE/ace/config-irix6.x-g++.h b/ACE/ace/config-irix6.x-g++.h
index 69455f27120..d2a4c11fb2f 100644
--- a/ACE/ace/config-irix6.x-g++.h
+++ b/ACE/ace/config-irix6.x-g++.h
@@ -8,16 +8,8 @@
 #define ACE_CONFIG_H
 #include /**/ "ace/pre.h"
 
-// config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
-// this must appear before its #include.
-#define ACE_HAS_STRING_CLASS
-
 #include "ace/config-g++-common.h"
 #include "ace/config-irix6.x-common.h"
 
-// Denotes that GNU has cstring.h as standard
-// which redefines memchr()
-#define ACE_HAS_GNU_CSTRING_H
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index 786efb8125c..4d345677418 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -50,7 +50,6 @@
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_GETRUSAGE
 #define ACE_HAS_GETRUSAGE_PROTOTYPE
-#define ACE_HAS_GNU_CSTRING_H
 #define ACE_HAS_GPERF
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_ICMP_SUPPORT 1
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 34137dab361..0f514b2544f 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -41,7 +41,6 @@
 #define ACE_HAS_GETPROGNAME 1
 #define ACE_HAS_GETRUSAGE 1
 #define ACE_HAS_GETRUSAGE_PROTOTYPE 1
-#define ACE_HAS_GNU_CSTRING_H 1
 #define ACE_HAS_GPERF 1
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1
 #define ACE_HAS_IP_MULTICAST 1
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index 83824daa0ed..bbbf462a730 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -72,7 +72,6 @@
 #define ACE_HAS_GETIFADDRS
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_GETRUSAGE
-#define ACE_HAS_GNU_CSTRING_H
 #define ACE_HAS_GPERF
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_ICMP_SUPPORT 1
diff --git a/ACE/ace/config-sco-5.0.0-nothread.h b/ACE/ace/config-sco-5.0.0-nothread.h
index 5c7b0b06c0f..f587778a4f7 100644
--- a/ACE/ace/config-sco-5.0.0-nothread.h
+++ b/ACE/ace/config-sco-5.0.0-nothread.h
@@ -8,7 +8,5 @@
 #include "ace/config-g++-common.h"
 #include "ace/config-sco-5.0.0.h"
 
-#define ACE_HAS_GNU_CSTRING_H
-
 #include /**/ "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-sunos5.4-g++.h b/ACE/ace/config-sunos5.4-g++.h
index 29add00caa0..c35b17896ff 100644
--- a/ACE/ace/config-sunos5.4-g++.h
+++ b/ACE/ace/config-sunos5.4-g++.h
@@ -17,7 +17,6 @@
 #define ACE_HAS_STRING_CLASS
 
 #include "ace/config-g++-common.h"
-#define ACE_HAS_GNU_CSTRING_H
 
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 6847aa16726..592567c8803 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -130,10 +130,10 @@
   // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
   // this must appear before its #include.
 # define ACE_HAS_STRING_CLASS
+
 # include "ace/config-g++-common.h"
+
 # define ACE_HAS_HI_RES_TIMER
-  // Denotes that GNU has cstring.h as standard, to redefine memchr().
-# define ACE_HAS_GNU_CSTRING_H
 # define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
 # if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h
index 21270f2e122..8f4fb828dcf 100644
--- a/ACE/ace/config-tru64.h
+++ b/ACE/ace/config-tru64.h
@@ -37,7 +37,6 @@
 
 # include "ace/config-g++-common.h"
 
-# define ACE_HAS_GNU_CSTRING_H
 # define ACE_HAS_REENTRANT_FUNCTIONS
 #elif defined (__DECCXX)
 
diff --git a/ACE/ace/config-unixware-7.1.0.h b/ACE/ace/config-unixware-7.1.0.h
index 072814c513e..7249b634298 100644
--- a/ACE/ace/config-unixware-7.1.0.h
+++ b/ACE/ace/config-unixware-7.1.0.h
@@ -107,9 +107,6 @@
    the one in ace/OS.i. */
 #define ACE_HAS_GETRUSAGE_PROTOTYPE 1
 
-/* Denotes that GNU has cstring.h as standard which redefines memchr() */
-#define ACE_HAS_GNU_CSTRING_H
-
 /* The GPERF utility is compiled for this platform */
 #define ACE_HAS_GPERF 1
 
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index bdcfd4f1396..9242bf312e7 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -109,7 +109,6 @@
 # define ACE_EXPORT_NESTED_CLASSES 1
 # define ACE_HAS_CPLUSPLUS_HEADERS 1
 # define ACE_HAS_EXCEPTIONS
-# define ACE_HAS_GNU_CSTRING_H 1
 # define ACE_HAS_NONCONST_SELECT_TIMEVAL
 # define ACE_HAS_SIG_ATOMIC_T
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h
index aca42dffc88..ec48e1b6422 100644
--- a/ACE/ace/config-win32-dmc.h
+++ b/ACE/ace/config-win32-dmc.h
@@ -49,7 +49,6 @@
 # define ACE_EXPORT_NESTED_CLASSES 1
 # define ACE_HAS_CPLUSPLUS_HEADERS 1
 //# define ACE_HAS_EXCEPTIONS 1
-# define ACE_HAS_GNU_CSTRING_H 1
 # define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
 # define ACE_HAS_SIG_ATOMIC_T 1
 # define ACE_HAS_STANDARD_CPP_LIBRARY 0
diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h
index efd0be0842f..937bcf1f479 100644
--- a/ACE/ace/config-win32-ghs.h
+++ b/ACE/ace/config-win32-ghs.h
@@ -57,7 +57,6 @@
 # define ACE_EXPORT_NESTED_CLASSES 1
 # define ACE_HAS_CPLUSPLUS_HEADERS 1
 //# define ACE_HAS_EXCEPTIONS 1
-# define ACE_HAS_GNU_CSTRING_H 1
 # define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
 # define ACE_HAS_SIG_ATOMIC_T 1
 # define ACE_HAS_STANDARD_CPP_LIBRARY 1
diff --git a/ACE/configure.ac b/ACE/configure.ac
index c9a0b6cd8d2..469e6412cca 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -1004,12 +1004,6 @@ AC_CHECK_HEADER([new],
    ACE_CHECK_HAS_HEADERS([new.h])
   ])
 
-dnl ace/OS.i can #include <cstring>,not #include <cstring.h>
-dnl "cstring" is the correct form.
-dnl TODO: Double check the above comment.
-AC_CHECK_HEADER([cstring],
-  [AC_DEFINE([ACE_HAS_GNU_CSTRING_H])],)
-
 AC_CHECK_HEADER([memory],,)
 
 dnl Check for availablity of "new style" C++ stream headers
diff --git a/ACE/m4/config_h.m4 b/ACE/m4/config_h.m4
index 46e2814b486..56378738340 100644
--- a/ACE/m4/config_h.m4
+++ b/ACE/m4/config_h.m4
@@ -322,9 +322,6 @@ AH_TEMPLATE([ACE_HAS_GETPAGESIZE],
 [Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must
 be defined, except on Win32).])
 
-AH_TEMPLATE([ACE_HAS_GNU_CSTRING_H],
-[Denotes that GNU has cstring.h as standard which redefines memchr()])
-
 AH_TEMPLATE([ACE_HAS_INTRINSIC_INTERLOCKED],
 [Platform supports the intrinsic interlocked optimizations.])