incorporated Torbjorn's unified configs

1 files changed, 2 insertions, 115 deletions

diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h
index 5f2e5332ca0..e3ae0bd34a5 100644
--- a/ace/config-linux-pthread.h
+++ b/ace/config-linux-pthread.h
@@ -7,124 +7,11 @@
 #if !defined (ACE_CONFIG_H)
 #define ACE_CONFIG_H
 
-#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-#if defined (i386)
-  // If running an Intel, assume that it's a Pentium so that
-  // ACE_OS::gethrtime () can use the RDTSC instruction.  If
-  // running a 486 or lower, be sure to comment this out.
-  // (If not running an Intel CPU, this #define will not be seen
-  //  because of the i386 protection, so it can be ignored.)
-# define ACE_HAS_PENTIUM
-#endif /* i386 */
-
-#define ACE_HAS_LONG_FDMASK
-#define ACE_HAS_LONGLONG_T
-#define ACE_HAS_STRING_CLASS
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// Fixes a problem with new versions of Linux...
-#ifndef msg_accrights
-#undef msg_control
-#define msg_accrights msg_control
-#endif
-
-#ifndef msg_accrightslen
-#undef msg_controllen
-#define msg_accrightslen msg_controllen
-#endif
-
-#define ACE_HAS_POSIX_TIME
-
-// Platform defines struct timespec but not timespec_t
-#define ACE_LACKS_TIMESPEC_T
-
-#define ACE_LACKS_STRRECVFD
-
-// ONLY define this if you have config'd multicast into a 2.x kernel.
-// If you do anything else, we've never tested it!
-#define ACE_HAS_IP_MULTICAST
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Platforms lacks UNIX domain sockets.
-//#define ACE_LACKS_UNIX_DOMAIN_SOCKETS
-
-// Compiler/platform supports alloca().
-#define ACE_HAS_ALLOCA
-
-//#define ACE_LACKS_SENDMSG
-//#define ACE_LACKS_RECVMSG
-#define ACE_LACKS_MSYNC
-#define ACE_LACKS_MADVISE
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-#define ACE_HAS_GETRUSAGE_PROTO
-
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Compiler/platform supports sys_siglist array.
-#define ACE_HAS_SYS_SIGLIST
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN
-
-// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
-#define LINUX 2.0.29
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-// Linux "improved" the interface to select() so that it modifies
-// the struct timeval to reflect the amount of time not slept
-// (see NOTES in Linux's select(2) man page).
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
-// Linux defines struct msghdr in /usr/include/socket.h
-#define ACE_HAS_MSG
-
-// TDN - adapted from file for SunOS4 platforms using the GNU g++ compiler
-// Compiler's template mechanism must see source code (i.e., .C files).
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-
-// Compiler doesn't support static data member templates.
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
-// Yes, we do have threads.
-#define ACE_HAS_THREADS
+#include "ace/config-linux-common.h"
 
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #if !defined (ACE_MT_SAFE)
-	#define ACE_MT_SAFE 1
+# define ACE_MT_SAFE 1
 #endif
 // And they're even POSIX pthreads (MIT implementation)
 #define ACE_HAS_PTHREADS