use common config file on SunOS 5.6 for SunC++ and g++

CVS:

2 files changed, 24 insertions, 15 deletions

diff --git a/ace/config-sunos5.6-sunc++-4.x.h b/ace/config-sunos5.6-sunc++-4.x.h
deleted file mode 100644
index 989890983fd..00000000000
--- a/ace/config-sunos5.6-sunc++-4.x.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for SunOS 5.6
-// platforms using the SunC++ 4.x compiler.
-
-#if !defined (ACE_CONFIG_H)
-
-// ACE_CONFIG_H is defined by the following #included header.
-
-// At this point, there's no difference between our SunOS 5.5 and 5.6
-// configurations.
-#include "ace/config-sunos5.5-sunc++-4.x.h"
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h
new file mode 100644
index 00000000000..1432ea7232d
--- /dev/null
+++ b/ace/config-sunos5.6.h
@@ -0,0 +1,24 @@
+/* -*- C++ -*- */
+// $Id$
+
+// The following configuration file is designed to work for SunOS 5.6
+// platforms using the SunC++ 4.x or g++ compilers.
+
+#if !defined (ACE_CONFIG_H)
+
+// ACE_CONFIG_H is defined by one of the following #included headers.
+
+// #include the SunOS 5.5 config file, then add SunOS 5.6 updates below.
+
+#if defined (__SUNPRO_CC)
+# include "ace/config-sunos5.5-sunc++-4.x.h"
+#elif defined (__GNUG__)
+# include "ace/config-sunos5.5-g++.h"
+#else  /* ! __SUNPRO_GNUG__ && ! __KCC */
+# error unsupported compiler in ace/config-sunos5.6.h
+#endif /* ! __GNUG__ && ! __KCC */
+
+// SunOS 5.6 does support sched_get_priority_{min,max}
+#undef ACE_THR_PRI_FIFO_DEF 30
+
+#endif /* ACE_CONFIG_H */