Just include config-aix-4.x.h for all AIX 4.x versions.

2 files changed, 2 insertions, 328 deletions

diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 52f1c1c22be..0f74d39a0c1 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -1,142 +1,4 @@
 /* -*- C++ -*- */
 // $Id$
 
-// The following configuration file is designed to work for OS
-// platforms running AIX 4.1.x using the IBM C++ compiler or g++.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-// Compiling for AIX.
-#define AIX
-
-// Grab appropriate settings for compiler in use
-#ifdef __GNUG__
-# include "ace/config-g++-common.h"
-#else
-# define ACE_HAS_EXCEPTIONS
-// Compiler supports the ssize_t typedef.
-# define ACE_HAS_SSIZE_T
-# define ACE_TEMPLATES_REQUIRE_PRAGMA
-#endif
-
-// Use BSD 4.4 socket definitions
-#define _BSD 44
-
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_DIRENT
-
-#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
-#define ACE_HAS_AIX_HI_RES_TIMER
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_UNION_WAIT
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-#define ACE_LACKS_RLIMIT
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_H_ERRNO
-#define ACE_LACKS_SETSCHED
-#define ACE_LACKS_TCP_H
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-#define ACE_LACKS_THREAD_STACK_ADDR
-// If ACE doesn't compile due to the lack of these methods, please
-// send email to schmidt@cs.wustl.edu reporting this.
-// #define ACE_LACKS_CONDATTR_PSHARED
-// #define ACE_LACKS_MUTEXATTR_PSHARED
-#define ACE_HAS_SIN_LEN
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_STRUCT_NETDB_DATA
-#define ACE_HAS_ALLOCA
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TLI
-#define ACE_HAS_TLI_PROTOTYPES
-#define ACE_HAS_TIUSER_H
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-#define ACE_HAS_CHARPTR_DL
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_THREADS
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-#define ACE_HAS_UTIME
-#define ACE_HAS_SELECT_H
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-#define ACE_HAS_MSG
-#define ACE_LACKS_MSG_ACCRIGHTS
-
-// The following two #defines may require OS patches.  If you
-// have trouble building ACE, try commenting them out.
-#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// This environment requires this thing
-#define _BSD_INCLUDES
-
-// Compiler supports the getrusage() system call
-#define ACE_HAS_GETRUSAGE
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Compiler/platform supports poll().
-#define ACE_HAS_POLL
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-// Compiler/platform defines the sig_atomic_t typedef
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Compiler supports stropts.h
-#define ACE_HAS_STREAMS
-// #define ACE_HAS_STREAM_PIPES
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// EYE the include file is there
-
-// AIX bzero()
-#define ACE_HAS_STRINGS
-
-// ??? has the berkeley stuff
-// #define ACE_HAS_SUNOS4_GETTIMEOFDAY
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-
-// Note, this only works if the flag is set above!
-#define ACE_HAS_GETRUSAGE
-
-// EYE assume it does for now.
-#define ACE_HAS_SIGTHREADMASK
-#define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_DRAFT7
-#define ACE_LACKS_RWLOCK_T
-#define ACE_PTHREADS_MAP
-
-// include there
-#define ACE_HAS_TIMOD_H
-#define ACE_HAS_TIUSER_H
-
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-#define ACE_HAS_STRBUF_T
-
-#define ACE_HAS_UALARM
-
-#endif /* ACE_CONFIG_H */
+#include "ace/config-aix-4.x.h"
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index 9616eaecd4b..0f74d39a0c1 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -1,192 +1,4 @@
 /* -*- C++ -*- */
 // $Id$
 
-// The following configuration file is designed to work for OS
-// platforms running AIX 4.2.x using the IBM C++ compiler (xlC) or
-// g++/egcs.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-#if defined (__xlC__)
-   // AIX xlC compiler
-   //********************************************************************
-   //
-   // Compiler-related definitions.  These are set for C Set ++ V3
-#  define ACE_HAS_EXCEPTIONS
-   // Compiler supports the ssize_t typedef.
-#  define ACE_HAS_SSIZE_T
-
-   // Keep an eye on this as the compiler and standards converge...
-#  define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#  define ACE_TEMPLATES_REQUIRE_PRAGMA
-
-#  define ACE_LACKS_PRAGMA_ONCE
-
-#elif defined (__GNUG__)
-# include "ace/config-g++-common.h"
-# define ACE_HAS_STRING_CLASS
-  // Denotes that GNU has cstring.h as standard, to redefine memchr().
-# define ACE_HAS_GNU_CSTRING_H
-# define ACE_MALLOC_ALIGN 8
-
-# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
-    // ACE_MT_SAFE is #defined below, for all compilers.
-#   if !defined (_REENTRANT)
-#     define _REENTRANT
-#   endif /* _REENTRANT */
-# endif /* !ACE_MT_SAFE */
-
-#else  /* ! __xlC__ && ! __GNUG__ */
-# error unsupported compiler in ace/config-aix-4.2.x.h
-#endif /* ! __xlC__ && ! __GNUG__ */
-
-
-// Compiling for AIX.
-#define AIX
-// Use BSD 4.4 socket definitions
-#define _BSD 44
-
-// This environment requires this thing
-#define _BSD_INCLUDES
-
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-
-// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are
-// not up to date.  On up-to-date systems, it should not be required.
-//#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
-
-#define ACE_HAS_AIX_HI_RES_TIMER
-#define ACE_HAS_ALLOCA
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_CHARPTR_DL
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// OS has readdir and friends.
-#define ACE_HAS_DIRENT
-
-// OS supports the getrusage() system call
-#define ACE_HAS_GETRUSAGE
-
-#define ACE_HAS_GPERF
-
-#define ACE_HAS_H_ERRNO
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_MSG
-
-// Compiler/platform supports poll().
-#define ACE_HAS_POLL
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_HAS_POSIX_TIME
-// ... but needs to include another header for it
-#define ACE_HAS_BROKEN_POSIX_TIME
-// ... and needs another typedef
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_HAS_SELECT_H
-
-// Compiler/platform defines the sig_atomic_t typedef
-#define ACE_HAS_SIG_ATOMIC_T
-#define ACE_HAS_SIGINFO_T
-#define ACE_LACKS_SIGINFO_H
-
-#define ACE_HAS_SIN_LEN
-#define ACE_HAS_SIZET_SOCKET_LEN
-#define ACE_HAS_STRBUF_T
-
-// Compiler supports stropts.h
-#define ACE_HAS_STREAMS
-// #define ACE_HAS_STREAM_PIPES
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// AIX bzero()
-#define ACE_HAS_STRINGS
-
-#define ACE_HAS_STRUCT_NETDB_DATA
-
-// Dynamic linking is in good shape on newer OS/patch levels.  If you have
-// trouble with the dynamic linking parts of ACE, and can't patch your OS
-// up to latest levels, comment this out.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-// This is tightly related to dynamic linking...
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TIMOD_H
-#define ACE_HAS_TIUSER_H
-#define ACE_HAS_TLI
-#define ACE_HAS_TLI_PROTOTYPES
-#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
-
-#define ACE_HAS_UALARM
-#define ACE_HAS_UCONTEXT_T
-#define ACE_HAS_UNION_WAIT
-#define ACE_HAS_UTIME
-
-// Platform has XPG4 wide character type and functions
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
-
-#define ACE_LACKS_TCP_H
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-//**************************************************************
-//
-// Threads related definitions.
-//
-// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS).
-// However, there is also a kernel thread ID (tid_t) that is used in
-// ACE_Log_Msg (printing the thread ID).  The tid_t is not the same as
-// pthread_t, and can't derive one from the other - thread_self() gets
-// the tid_t (kernel thread ID) if called from a thread.
-// Thanks very much to Chris Lahey for straightening this out.
-
-#define ACE_HAS_THREADS
-#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1
-#endif
-
-#define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_DRAFT7
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SIGTHREADMASK
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// If ACE doesn't compile due to the lack of these methods, please
-// send email to ace-users@cs.wustl.edu reporting this.
-// #define ACE_LACKS_CONDATTR_PSHARED
-// #define ACE_LACKS_MUTEXATTR_PSHARED
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SETSCHED
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-#define ACE_LACKS_THREAD_STACK_ADDR
-
-// By default, tracing code is not compiled.  To compile it in, cause
-// ACE_NTRACE to not be defined, and rebuild ACE.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#endif /* ACE_CONFIG_H */
+#include "ace/config-aix-4.x.h"