Changed to work with both xlC and gcc.

1 files changed, 90 insertions, 84 deletions

diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index 7c1d6b2bd30..f99254631cb 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -2,11 +2,45 @@
 // $Id$
 
 // The following configuration file is designed to work for OS
-// platforms running AIX 4.2.x using the IBM C++ compiler.
+// platforms running AIX 4.2.x using the IBM C++ compiler (xlC) or
+// g++/egcs.
 
 #if !defined (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
+
+#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  /* ! _AIX && ! __GNUG__ */
+# error unsupported compiler in ace/config-aix-4.2.x.h
+#endif /* ! _AIX && ! __GNUG__ */
+
+
 // Compiling for AIX.
 #define AIX
 // Use BSD 4.4 socket definitions
@@ -15,129 +49,112 @@
 // 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
 
-// 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
-
-//********************************************************************
-//
-// Compiler-related definitions.  These are set for C Set ++ V3
-#define ACE_HAS_EXCEPTIONS
-#define ACE_TEMPLATES_REQUIRE_PRAGMA
-
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-
 #define ACE_HAS_AIX_HI_RES_TIMER
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-#define ACE_HAS_UNION_WAIT
-#define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_H_ERRNO
-#define ACE_HAS_SIN_LEN
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_STRUCT_NETDB_DATA
 #define ACE_HAS_ALLOCA
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TLI
-#define ACE_HAS_TLI_PROTOTYPES
-#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
-#define ACE_HAS_TIUSER_H
-#define ACE_HAS_CHARPTR_DL
-#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_UTIME
-#define ACE_HAS_SELECT_H
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-#define ACE_HAS_MSG
-// #define ACE_LACKS_RECVMSG
-// #define ACE_LACKS_SENDMSG
 
-// Compiler supports the getrusage() system call
-#define ACE_HAS_GETRUSAGE
+// 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
 
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Compiler has readdir and friends.
+// OS has readdir and friends.
 #define ACE_HAS_DIRENT
 
+// OS supports the getrusage() system call
+#define ACE_HAS_GETRUSAGE
+
+#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
 
-// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
+#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
 
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
 
 // AIX bzero()
 #define ACE_HAS_STRINGS
 
-// ??? has the berkeley stuff
-// #define ACE_HAS_SUNOS4_GETTIMEOFDAY
-#define ACE_HAS_SVR4_GETTIMEOFDAY
+#define ACE_HAS_STRUCT_NETDB_DATA
 
-// Note, this only works if the flag is set above!
-#define ACE_HAS_GETRUSAGE
+// 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
 
-// include there
+#define ACE_HAS_SYSV_IPC			
 #define ACE_HAS_TIMOD_H
 #define ACE_HAS_TIUSER_H
-#define ACE_HAS_STRBUF_T
+#define ACE_HAS_TLI
+#define ACE_HAS_TLI_PROTOTYPES
+#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
 
-#define ACE_HAS_SIGINFO_T
-#define ACE_LACKS_SIGINFO_H
 #define ACE_HAS_UCONTEXT_T
-#define ACE_HAS_SIZET_SOCKET_LEN
+#define ACE_HAS_UNION_WAIT
+#define ACE_HAS_UTIME
 
 // Platform has XPG4 wide character type and functions
 #define ACE_HAS_XPG4_MULTIBYTE_CHAR
 
-// Keep an eye on this as the compiler and standards converge...
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
 
 #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).  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.
+// 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)
@@ -147,7 +164,7 @@
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_DRAFT7
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_REENTRANT_FUNCTIONS
+#define ACE_HAS_REENTRANT_FUNCTIONS 
 #define ACE_HAS_SIGTHREADMASK
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
@@ -157,7 +174,7 @@
 //#define ACE_HAS_THREAD_SELF
 
 // If ACE doesn't compile due to the lack of these methods, please
-// send email to schmidt@cs.wustl.edu reporting this.
+// 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
@@ -165,17 +182,6 @@
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
 #define ACE_LACKS_THREAD_STACK_ADDR
 
-// BSD 4.4 interface fixes nabbed from config-linux.h
-#if !defined (msg_accrights)
-#undef msg_control
-#define msg_accrights msg_control
-#endif /* msg_accrights */
-
-#if !defined (msg_accrightslen)
-#undef msg_controllen
-#define msg_accrightslen msg_controllen
-#endif /* msg_accrightslen */
-
 // 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)