factored out Green Hill-specific #defines to config-ghs-common.h

5 files changed, 50 insertions, 27 deletions

diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 9d5cee81633..f823475d381 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -23,9 +23,11 @@
 # undef ACE_HAS_ANSI_CASTS
 # define ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS
 #elif defined (ghs)
+# define ACE_CONFIG_INCLUDE_GHS_COMMON
+# include "ace/config-ghs-common.h"
+
 # define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 # define ACE_HAS_TANDEM_SIGNALS
-# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_LACKS_ACE_IOSTREAM  /* MVME lacks signed and unsigned char */
 # define ACE_LACKS_FLOATING_POINT
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 2c40cd94033..ea5704d52ab 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -9,6 +9,9 @@
 
 #define ACE_DGUX
 
+# define ACE_CONFIG_INCLUDE_GHS_COMMON
+# include "ace/config-ghs-common.h"
+
 // Static objects do not get initialized correctly, so this is needed.
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 
@@ -54,9 +57,6 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-// Compiler/platform does not support the "long long" datatype.
-#define ACE_LACKS_LONGLONG_T
-
 // Green Hills doesn't give a preprocessor symbol for long double
 #define ACE_SIZEOF_LONG_DOUBLE 8
 
@@ -180,9 +180,7 @@
 // Platform doesn't correctly support signed char
 #define ACE_LACKS_SIGNED_CHAR
 
-// Platform doesn't have streambuf linebuffered()
 #define ACE_LACKS_ACE_IOSTREAM
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
 // Use the poll() event demultiplexor rather than select().
 //#define ACE_USE_POLL
@@ -195,7 +193,6 @@
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
 #define ACE_HAS_UCONTEXT_T
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
new file mode 100644
index 00000000000..82f17c48bd2
--- /dev/null
+++ b/ace/config-ghs-common.h
@@ -0,0 +1,33 @@
+/* -*- C++ -*- */
+// $Id$
+
+// This configuration file is designed to be included by another,
+// specific configuration file.  It provides config information common
+// to all Green Hills platforms.
+
+#ifndef ACE_GHS_COMMON_H
+#define ACE_GHS_COMMON_H
+
+#if !defined (ACE_CONFIG_INCLUDE_GHS_COMMON)
+# error ace/config-ghs-common.h: ACE configuration error!  Do not #include this file directly!
+#endif
+
+#if defined (ghs)
+
+# if defined (__STANDARD_CXX)
+    // Green Hills 1.8.9, but not 1.8.8.
+#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
+#   define ACE_LACKS_CHAR_RIGHT_SHIFTS
+#   define ACE_LACKS_UNBUFFERED_STREAMBUF
+# endif /* __STANDARD_CXX */
+
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+# define ACE_HAS_WCHAR_TYPEDEFS_CHAR
+# define ACE_LACKS_LINEBUFFERED_STREAMBUF
+# define ACE_LACKS_LONGLONG_T
+
+#else  /* ! ghs */
+# error ace/config-ghs-common.h can only be used with Green Hills compilers!
+#endif /* ! ghs */
+
+#endif /* ACE_GHS_COMMON_H */
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index b2e422204af..10137ae724d 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -84,15 +84,6 @@
 # endif /* !ACE_MT_SAFE */
 
 #elif defined (ghs)
-# if defined (__STANDARD_CXX)
-   // Green Hills 1.8.9, but not 1.8.8.
-#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
-# endif /* __STANDARD_CXX */
-
-# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-# define ACE_LACKS_LINEBUFFERED_STREAMBUF
-# define ACE_LACKS_LONGLONG_T /* It really doesn't have it.  Boo. */
-# define ACE_LACKS_SIGNED_CHAR
 
 # if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
     // ACE_MT_SAFE is #defined below, for all compilers.
@@ -104,6 +95,9 @@
 #   endif /* _REENTRANT */
 # endif /* !ACE_MT_SAFE */
 
+# define ACE_CONFIG_INCLUDE_GHS_COMMON
+# include "ace/config-ghs-common.h"
+
   // To avoid warning about inconsistent declaration between Sun's
   // stdlib.h and Green Hills' ctype.h.
 # include <stdlib.h>
diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h
index 807fb0c1095..3f2d2020df0 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -41,6 +41,10 @@
   // compile, though, because of the period!  So, let g++/VxWorks users
   // include iostream.h only where they need it.
 # define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
+
+# define ACE_LACKS_LINEBUFFERED_STREAMBUF
+# define ACE_LACKS_SIGNED_CHAR
+
 #elif defined (ghs)
   // Processor type, if necessary.  Green Hills defines "ppc".
 # if defined (ppc)
@@ -56,17 +60,12 @@
 #   define ACE_HAS_PENTIUM
 # endif /* i386 */
 
-# if defined (__STANDARD_CXX)
-    // Green Hills 1.8.9, but not 1.8.8.
-#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#   define ACE_LACKS_CHAR_RIGHT_SHIFTS
-#   define ACE_LACKS_UNBUFFERED_STREAMBUF
-# endif /* __STANDARD_CXX */
+# define ACE_CONFIG_INCLUDE_GHS_COMMON
+# include "ace/config-ghs-common.h"
 
-# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-# define ACE_HAS_WCHAR_TYPEDEFS_CHAR
-# define ACE_LACKS_LONGLONG_T
+# define ACE_LACKS_SIGNED_CHAR
 # define ACE_LACKS_UNISTD_H
+
 #else  /* ! __GNUG__ && ! ghs */
 # error unsupported compiler on VxWorks
 #endif /* ! __GNUG__ && ! ghs */
@@ -105,7 +104,6 @@
 #define ACE_LACKS_GETHOSTENT
 #define ACE_LACKS_GETSERVBYNAME
 #define ACE_LACKS_KEY_T
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_LSTAT
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
@@ -125,7 +123,6 @@
 #define ACE_LACKS_SEEKDIR
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_SIGINFO_H
-#define ACE_LACKS_SIGNED_CHAR
 #define ACE_LACKS_SI_ADDR
 #define ACE_LACKS_SOCKETPAIR
 #define ACE_LACKS_STRCASECMP