just #include config-sunos5.5-sunc++-4.x.h

1 files changed, 4 insertions, 212 deletions

diff --git a/ace/config-sunos5.6-sunc++-4.x.h b/ace/config-sunos5.6-sunc++-4.x.h
index b8d0309c695..989890983fd 100644
--- a/ace/config-sunos5.6-sunc++-4.x.h
+++ b/ace/config-sunos5.6-sunc++-4.x.h
@@ -5,219 +5,11 @@
 // platforms using the SunC++ 4.x compiler.
 
 #if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
 
-// Compiler version-specific settings:
-#if defined (__SUNPRO_CC)
-#  if (__SUNPRO_CC < 0x410)
-    // The following might not be necessary, but I can't tell: my build
-    // with Sun C++ 4.0.1 never completes.
-#    define ACE_NEEDS_DEV_IO_CONVERSION
-#  elif (__SUNPRO_CC >= 0x420)
-    // Sun C++ 4.2 (and beyond) supports template specialization.
-#    define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-#    define ACE_TEMPLATES_REQUIRE_SOURCE
-#  endif
-#endif /* __SUNPRO_CC */
+// ACE_CONFIG_H is defined by the following #included header.
 
-#if ! defined (__ACE_INLINE__)
-// NOTE:  if you have link problems with undefined inline template functions,
-// be sure that the #define of __ACE_INLINE__ below is not commented out.
-#  define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// ACE_HAS_EXCEPTIONS precludes -noex in
-// include/makeinclude/platform_macros.GNU.  But beware, we have
-// seen problems with exception handling on multiprocessor
-// UltraSparcs:  threaded executables core dump when threads exit.
-// This problem does not seem to appear on single-processor UltraSparcs.
-// And, it is solved with the application of patch
-//   104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC"
-// to Sun C++ 4.2.
-// To provide optimum performance, ACE_HAS_EXCEPTIONS is disabled by
-// default.  It can be enabled by adding "exceptions=1" to the "make"
-// invocation.  See include/makeinclude/platform_sunos5_sunc++.GNU
-// for details.
-// #define ACE_HAS_EXCEPTIONS
-
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-// Platform supports pread() and pwrite()
-#define ACE_HAS_P_READ_WRITE
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR 
-#define ACE_HAS_UALARM
-#define ACE_LACKS_UALARM_PROTOTYPE
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Platform supports system configuration information.
-#define ACE_HAS_SYSINFO
-
-// Platform supports the POSIX regular expression library.
-#define ACE_HAS_REGEX
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
-
-// Compiler/platform correctly calls init()/fini() for shared libraries.
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Compiler/platform supports SunOS high resolution timers.
-#define ACE_HAS_HI_RES_TIMER
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Sockets may be called in multi-threaded programs.
-#define ACE_HAS_MT_SAFE_SOCKETS
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_SVR4_TIME
-
-// ACE_HAS_CLOCK_GETTIME requires linking with -lposix4.
-// #define ACE_HAS_CLOCK_GETTIME
-
-// Platform supports the /proc file system.
-#define ACE_HAS_PROC_FS
-
-// Platform supports the prusage_t struct.
-#define ACE_HAS_PRUSAGE_T
-
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Platform supports SVR4 extended signals.
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_UCONTEXT_T
-
-// Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SOCKIO_H
-
-// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS
-
-// 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
-
-// Compiler/platform supports SVR4 dynamic linking semantics.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// Compiler/platform supports SVR4 gettimeofday() prototype.
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-
-// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)...
-#define ACE_HAS_SVR4_TLI
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H
-
-// Compiler/platform supports sys_siglist array.
-#define ACE_HAS_SYS_SIGLIST
-
-// Platform supports XPG4 wide characters
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
-/* Comment out the following defines if you want to disable threading. */
-// Compile using multi-thread libraries.
-#if !defined (ACE_MT_SAFE)
-	#define ACE_MT_SAFE 1
-#endif
-
-// Platform supports threads.
-#define ACE_HAS_THREADS
-
-// Platform supports POSIX pthreads *and* Solaris threads!  If you
-// only want to use POSIX pthreads just comment out ACE_HAS_STHREADS.
-#define ACE_HAS_STHREADS
-#define ACE_HAS_PTHREADS
-// . . . but only supports SCHED_OTHER scheduling policy
-#define ACE_HAS_ONLY_SCHED_OTHER
-#define ACE_HAS_SIGWAIT
-#define ACE_LACKS_CONDATTR_PSHARED
-
-// Compiler/platform has thread-specific storage
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// Platform supports reentrant functions (i.e., all the POSIX *_r functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-/* End of threading #defines */
-
-#define ACE_HAS_ONEARG_SIGWAIT
-#define ACE_HAS_PTHREAD_SIGMASK
-#define ACE_HAS_THR_YIELD
-#define ACE_LACKS_PTHREAD_YIELD
-
-// Reactor detects deadlock
-// #define ACE_REACTOR_HAS_DEADLOCK_DETECTION
-
-// Platform supports ACE_TLI timod STREAMS module.
-#define ACE_HAS_TIMOD_H
-
-// Platform supports ACE_TLI tiuser header.
-#define ACE_HAS_TIUSER_H
-
-// Platform provides ACE_TLI function prototypes.
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform supports ACE_TLI.
-#define ACE_HAS_TLI
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_LACKS_SIGNED_CHAR
-
-// Use the poll() event demultiplexor rather than select().
-//#define ACE_USE_POLL
-
-// 10 millisecond fudge factor to account for Solaris timers...
-#if !defined (ACE_TIMER_SKEW)
-#define ACE_TIMER_SKEW 1000 * 10
-#endif /* ACE_TIMER_SKEW */
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-// Defines the page size of the system.
-#define ACE_HAS_GETPAGESIZE 1
+// 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 */