Fri Oct 1 11:55:23 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/config-g++-common.h:
        * ace/config-qnx-neutrino.h:
        * ace/config-qnx-rtp-common.h:
          Fixed redefinition warnings
 
        * ace/ace_for_tao.mpc:
          Zapped some files

        * ace/config-win32-common.h:
        * ace/config-win32-msvc.h:
        * ace/config-win32.h:
          Cleanup

        * ace/config-win32-ghs.h:
          Removed this file.

9 files changed, 28 insertions, 102 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b53c4a10539..dacdba66628 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Fri Oct  1 11:55:23 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-g++-common.h:
+        * ace/config-qnx-neutrino.h:
+        * ace/config-qnx-rtp-common.h:
+          Fixed redefinition warnings
+
+        * ace/ace_for_tao.mpc:
+          Zapped some files
+
+        * ace/config-win32-common.h:
+        * ace/config-win32-msvc.h:
+        * ace/config-win32.h:
+          Cleanup
+
+        * ace/config-win32-ghs.h:
+          Removed this file.
+
 Thu Sep 30 10:49:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * debian/mpc-ace.install:
diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc
index 339836f20a2..593fe18efae 100644
--- a/ACE/ace/ace_for_tao.mpc
+++ b/ACE/ace/ace_for_tao.mpc
@@ -353,8 +353,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace,
     config-minimal.h
     config-win32-borland.h
     config-win32-common.h
-    config-win32-ghs.h
-    config-win32-msvc-6.h
     config-win32-msvc-7.h
     config-win32-msvc.h
     config-win32.h
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index 655d3c68e1b..ce20a0b1921 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -10,7 +10,9 @@
 #define ACE_GNUG_COMMON_H
 #include /**/ "ace/pre.h"
 
-#define ACE_CC_NAME ACE_TEXT ("g++")
+#if !defined (ACE_CC_NAME)
+# define ACE_CC_NAME ACE_TEXT ("g++")
+#endif
 #define ACE_CC_MAJOR_VERSION __GNUC__
 #define ACE_CC_MINOR_VERSION __GNUC_MINOR__
 #define ACE_CC_BETA_VERSION (0)
diff --git a/ACE/ace/config-qnx-neutrino.h b/ACE/ace/config-qnx-neutrino.h
index faa9cd7b94a..5def543440a 100644
--- a/ACE/ace/config-qnx-neutrino.h
+++ b/ACE/ace/config-qnx-neutrino.h
@@ -24,8 +24,6 @@
 # endif /* __X86__ */
 #endif /* __OPTIMIZE__ */
 
-#include "ace/config-g++-common.h"
-
 // The following defines the Neutrino compiler.
 // gcc should know to call g++ as necessary
 #ifdef __GNUC__
@@ -34,6 +32,8 @@
 # define ACE_CC_NAME ACE_TEXT ("NTO compiler ??")
 #endif
 
+#include "ace/config-g++-common.h"
+
 // /usr/nto/include/float.h defines
 //  FLT_MAX_EXP 127
 //  DBL_MAX_EXP 1023
diff --git a/ACE/ace/config-qnx-rtp-common.h b/ACE/ace/config-qnx-rtp-common.h
index 13fa05aa7c7..0b100765f87 100644
--- a/ACE/ace/config-qnx-rtp-common.h
+++ b/ACE/ace/config-qnx-rtp-common.h
@@ -23,8 +23,6 @@
 # endif /* __X86__ */
 #endif /* __OPTIMIZE__ */
 
-#include "ace/config-g++-common.h"
-
 // The following defines the Neutrino compiler.
 // gcc should know to call g++ as necessary
 #ifdef __GNUC__
@@ -33,6 +31,8 @@
 # define ACE_CC_NAME ACE_TEXT ("QNX-RTP compiler ??")
 #endif
 
+#include "ace/config-g++-common.h"
+
 // /usr/nto/include/float.h defines
 //  FLT_MAX_EXP 127
 //  DBL_MAX_EXP 1023
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 1fedecccdcd..ddfad783c6b 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -300,12 +300,11 @@
 #define ACE_MKDIR_LACKS_MODE
 
 #define ACE_SIZEOF_LONG_LONG 8
-// Green Hills Native x86 does not support __int64 keyword
-// Neither does mingw32.
+
 #if !defined (ACE_LACKS_LONGLONG_T) && !defined (__MINGW32__)
 #define ACE_INT64_TYPE  signed __int64
 #define ACE_UINT64_TYPE unsigned __int64
-#endif /* (ghs) */
+#endif
 
 #if defined (__MINGW32__)
 #define ACE_INT64_TYPE  signed long long
diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h
deleted file mode 100644
index e317e0022cd..00000000000
--- a/ACE/ace/config-win32-ghs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// The following configuration file contains defines for Green Hills compilers.
-
-#ifndef ACE_CONFIG_WIN32_GHS_H
-#define ACE_CONFIG_WIN32_GHS_H
-#include /**/ "ace/pre.h"
-
-#ifndef ACE_CONFIG_WIN32_H
-#error Use config-win32.h in config.h instead of this header
-#endif /* ACE_CONFIG_WIN32_H */
-
-#ifndef WIN32
-#  define WIN32
-#endif /* WIN32 */
-
-#undef _M_IX86
-// This turns on ACE_HAS_PENTIUM
-#define _M_IX86 500
-// GHS does not provide DLL support
-#define ACE_HAS_DLL 0
-#define TAO_HAS_DLL 0
-#undef _DLL
-
-//Green Hills Native x86 does not support structural exceptions
-# undef ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
-# undef ACE_HAS_WCHAR
-# define ACE_CONFIG_INCLUDE_GHS_COMMON
-# include "ace/config-ghs-common.h"
-
-// Changed ACE_TEXT to ACE_TEXT in the following line
-# define ACE_CC_NAME ACE_TEXT ("Green Hills C++")
-# define ACE_CC_MAJOR_VERSION (1)
-# define ACE_CC_MINOR_VERSION (8)
-# define ACE_CC_BETA_VERSION (9)
-# define ACE_CC_PREPROCESSOR "GCX.EXE"
-# define ACE_CC_PREPROCESSOR_ARGS "-E"
-
-// GHS uses Microsoft's standard cpp library, which has auto_ptr.
-# undef ACE_LACKS_AUTO_PTR
-// Microsoft's standard cpp library auto_ptr doesn't have reset ().
-# define ACE_AUTO_PTR_LACKS_RESET
-
-#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
-
-// This section below was extracted from config-win32-msvc
-#define ACE_HAS_ITOA
-#define ACE_ITOA_EQUIVALENT ::_itoa
-#define ACE_STRCASECMP_EQUIVALENT ::_stricmp
-#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp
-#define ACE_WCSDUP_EQUIVALENT ::_wcsdup
-//  This section above was extracted from config-win32-msvc
-
-# define ACE_EXPORT_NESTED_CLASSES 1
-# define ACE_HAS_CPLUSPLUS_HEADERS 1
-# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1
-# define ACE_HAS_SIG_ATOMIC_T 1
-# define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# define ACE_HAS_STDCPP_STL_INCLUDES 1
-# define ACE_HAS_STRING_CLASS 1
-# define ACE_HAS_USER_MODE_MASKS 1
-# define ACE_LACKS_ACE_IOSTREAM 1
-//# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1
-# define ACE_LACKS_STRPTIME 1
-//# define ACE_LACKS_PRAGMA_ONCE 1
-# define ACE_LACKS_STRRECVFD 1
-//# define ACE_NEW_THROWS_EXCEPTIONS 1
-# define ACE_SIZEOF_LONG_DOUBLE 10
-# define ACE_TEMPLATES_REQUIRE_SOURCE 1
-# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u"
-# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d"
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-// Set the following to zero to placate SString.h ACE_WString CTOR
-# undef ACE_WSTRING_HAS_USHORT_SUPPORT
-
-// Green Hills Native x86 does not support __int64 keyword
-# define ACE_LACKS_LONGLONG_T
-
-/* need to ensure these are included before <iomanip> */
-# include <time.h>
-# include <stdlib.h>
-
-# if !defined (ACE_LD_DECORATOR_STR) && defined (_DEBUG)
-#  define ACE_LD_DECORATOR_STR ACE_TEXT ("d")
-# endif
-
-#include /**/ "ace/post.h"
-#endif /* ACE_CONFIG_WIN32_GHS_H */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 69462fb0ff0..c19f3e6fb3f 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -138,7 +138,7 @@
 // To resume any of these warning: #pragma warning(default: 4xxx)
 // which should be placed after these defines
 
-#if !defined (ALL_WARNINGS) && defined(_MSC_VER) && !defined(ghs) && !defined(__MINGW32__)
+#if !defined (ALL_WARNINGS) && defined(_MSC_VER) && !defined(__MINGW32__)
 #     pragma warning(disable: 4127)  /* constant expression for TRACE/ASSERT */
 #     pragma warning(disable: 4134)  /* message map member fxn casts */
 #     pragma warning(disable: 4511)  /* private copy constructors are good to have */
diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h
index 417b7ccfc28..2cec6941530 100644
--- a/ACE/ace/config-win32.h
+++ b/ACE/ace/config-win32.h
@@ -35,8 +35,6 @@
 #    include "ace/config-win32-borland.h"
 #elif defined (_MSC_VER)
 #    include "ace/config-win32-msvc.h"
-#elif defined (ghs)
-#    include "ace/config-win32-ghs.h"
 #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32
 #    include "ace/config-win32-cegcc.h"
 #elif defined (__MINGW32__)