ChangeLogTag:Sun Aug 17 17:02:53 1997 Carlos O'Ryan <coryan@swarm.cs.wustl.edu>

12 files changed, 77 insertions, 808 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 2ea6f16ce71..780b159ca9c 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -784,7 +784,7 @@ ACE::sendto (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::sendto_timedwait (handle, buf, len, flags, addr, addrlen, &ts);
     }
 #else
@@ -814,7 +814,7 @@ ACE::sendmsg (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::sendmsg_timedwait (handle, msg, flags, &ts);
     }
 #else
@@ -843,7 +843,7 @@ ACE::readv (ACE_HANDLE handle,
   else {
      ACE_Time_Value copy = *timeout;
      copy += ACE_OS::gettimeofday ();
-     timestruc_t ts = copy;
+     timespec_t ts = copy;
      return ::readv_timedwait (handle, iov, iovcnt, &ts);
   }
 #else
@@ -872,7 +872,7 @@ ACE::writev (ACE_HANDLE handle,
   else {
      ACE_Time_Value copy = *timeout;
      copy += ACE_OS::gettimeofday ();
-     timestruc_t ts = copy;
+     timespec_t ts = copy;
      return ::writev_timedwait (handle, iov, iovcnt, &ts);
   }
 #else
@@ -1404,7 +1404,7 @@ ACE::send (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::send_timedwait (handle, buf, n, flags, &ts);
     }
 #else
@@ -1435,7 +1435,7 @@ ACE::send (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::write_timedwait (handle, buf, n, &ts);
     }
 #else
@@ -1495,7 +1495,7 @@ ACE::recvfrom (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::recvfrom_timedwait (handle, buf, len, flags, addr, addrlen, &ts);
     }
 #else
@@ -1525,7 +1525,7 @@ ACE::recvmsg (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::recvmsg_timedwait (handle, msg, flags, &ts);
     }
 #else
@@ -1555,7 +1555,7 @@ ACE::recv (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::read_timedwait (handle, buf, n, &ts);
     }
 #else
@@ -1587,7 +1587,7 @@ ACE::recv (ACE_HANDLE handle,
     {
       ACE_Time_Value copy = *timeout;
       copy += ACE_OS::gettimeofday ();
-      timestruc_t ts = copy;
+      timespec_t ts = copy;
       return ::recv_timedwait (handle, buf, len, flags, &ts);
     }
 #else
diff --git a/ace/OS.h b/ace/OS.h
index b9f1049ca12..3148d2fa5b4 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -506,15 +506,6 @@ typedef int clockid_t;
 #endif /* CLOCK_REALTIME */
 #endif /* ! ACE_HAS_CLOCK_GETTIME && ! _CLOCKID_T */
 
-// #if (!defined (timespec) && !defined (m88k))
-// #define timestruc_t struct timespec
-// #endif /* timespec */
-
-#if !defined (ACE_HAS_SVR4_TIME)
-// Definition per SVr4.
-typedef struct timespec timestruc_t;	
-#endif /* ACE_HAS_SVR4_TIME */
-
 class ACE_Export ACE_Time_Value
   // = TITLE
   //     Operations on "timeval" structures.
@@ -543,8 +534,8 @@ public:
   ACE_Time_Value (const struct timeval &t);
   // Construct the <ACE_Time_Value> from a <timeval>.
 
-  ACE_Time_Value (const timestruc_t &t);
-  //  Initializes the <ACE_Time_Value> object from a <timestruc_t>.
+  ACE_Time_Value (const timespec_t &t);
+  //  Initializes the <ACE_Time_Value> object from a <timespec_t>.
 
   ACE_Time_Value (const ACE_Time_Value &tv);
   // Copy constructor.
@@ -564,12 +555,12 @@ public:
   void set (const timeval &t);
   // Construct a <Time_Value> from a <timeval>.
 
-  void set (const timestruc_t &t);
-  // Initializes the <Time_Value> object from a <timestruc_t>.
+  void set (const timespec_t &t);
+  // Initializes the <Time_Value> object from a <timespec_t>.
 
 #if defined (ACE_WIN32)
   void set (const FILETIME &ft);
-  //  Initializes the <Time_Value> object from a <timestruc_t>. 
+  //  Initializes the <Time_Value> object from a <timespec_t>. 
 #endif /* ACE_WIN32 */
 
   long msec (void) const;
@@ -578,8 +569,8 @@ public:
   void msec (long);
   // Converts from milli-seconds format into <Time_Value> format.
 
-  operator timestruc_t () const;
-  // Returns the value of the object as a <timestruc_t>. 
+  operator timespec_t () const;
+  // Returns the value of the object as a <timespec_t>. 
 
   operator timeval () const;
   // Returns the value of the object as a <timeval>.
diff --git a/ace/OS.i b/ace/OS.i
index 41f84893900..b6953185379 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -147,13 +147,13 @@ ACE_Time_Value::set (double d)
   this->normalize ();
 }
 
-// Initializes a timestruc_t.  Note that this approach loses precision
+// Initializes a timespec_t.  Note that this approach loses precision
 // since it converts the nano-seconds into micro-seconds.  But then
 // again, do any real systems have nano-second timer precision
 // anyway?!
 
 ACE_INLINE void
-ACE_Time_Value::set (const timestruc_t &tv)
+ACE_Time_Value::set (const timespec_t &tv)
 {
   // ACE_TRACE ("ACE_Time_Value::set");
 #if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
@@ -233,13 +233,13 @@ operator >= (const ACE_Time_Value &tv1,
     return 0;
 }
 
-// Returns the value of the object as a timestruc_t. 
+// Returns the value of the object as a timespec_t. 
 
 ACE_INLINE 
-ACE_Time_Value::operator timestruc_t () const
+ACE_Time_Value::operator timespec_t () const
 {
-  // ACE_TRACE ("ACE_Time_Value::operator timestruc_t");
-  timestruc_t tv;
+  // ACE_TRACE ("ACE_Time_Value::operator timespec_t");
+  timespec_t tv;
 #if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
   tv.tv_sec = this->tv_.tv_sec;
   tv.tv_nsec = this->tv_.tv_usec * 1000;
@@ -250,10 +250,10 @@ ACE_Time_Value::operator timestruc_t () const
   return tv;
 }
 
-// Initializes the ACE_Time_Value object from a timestruc_t.
+// Initializes the ACE_Time_Value object from a timespec_t.
 
 ACE_INLINE
-ACE_Time_Value::ACE_Time_Value (const timestruc_t &tv)
+ACE_Time_Value::ACE_Time_Value (const timespec_t &tv)
 {
   // ACE_TRACE ("ACE_Time_Value::ACE_Time_Value");
   this->set (tv);
@@ -1740,7 +1740,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
   // ACE_TRACE ("ACE_OS::cond_timedwait");
 #if defined (ACE_HAS_THREADS)
   int result;
-  timestruc_t ts = *timeout; // Calls ACE_Time_Value::operator timestruc_t().
+  timespec_t ts = *timeout; // Calls ACE_Time_Value::operator timespec_t().
 
 #if (defined (ACE_HAS_DCETHREADS) || defined (ACE_HAS_PTHREADS)) && !defined (ACE_HAS_FSU_PTHREADS)
   ACE_OSCALL (ACE_ADAPT_RETVAL (timeout == 0
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index 3cc4ff69a29..dd7a82214bd 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -92,7 +92,7 @@ void
 ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et)
 {
   ACE_TRACE ("ACE_Profile_Timer::compute_times");
-  timestruc_t td;
+  timespec_t td;
 
   ACE_Profile_Timer::Rusage &end = this->end_usage_;
   ACE_Profile_Timer::Rusage &begin = this->begin_usage_;
@@ -108,7 +108,7 @@ ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et)
 // Determine the difference between T1 and T2. 
 
 void
-ACE_Profile_Timer::subtract (timestruc_t &tdiff, timestruc_t &t1, timestruc_t &t0)
+ACE_Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
 {
   ACE_TRACE ("ACE_Profile_Timer::subtract");
   tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 4b682d08e19..29add308f84 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -106,7 +106,7 @@ private:
   // Keep track of the last rusage for incremental timing.
 
 #if defined (ACE_HAS_PRUSAGE_T)
-  void subtract (timestruc_t &tdiff, timestruc_t &t0, timestruc_t &t1);
+  void subtract (timespec_t &tdiff, timespec_t &t0, timespec_t &t1);
   // Substract two timestructs and store their difference.
 
   ACE_HANDLE proc_handle_;
diff --git a/ace/README b/ace/README
index c7510ddf225..14d506c10b3 100644
--- a/ace/README
+++ b/ace/README
@@ -142,7 +142,7 @@ ACE_HAS_SUNOS4_SIGNAL_T			Compiler has horrible SunOS 4.x signal handlers...
 ACE_HAS_SVR4_DYNAMIC_LINKING		Compiler/platform supports SVR4 dynamic linking semantics
 ACE_HAS_SVR4_GETTIMEOFDAY		Compiler/platform supports SVR4 gettimeofday() prototype
 ACE_HAS_SVR4_SIGNAL_T			Compiler/platform supports SVR4 signal typedef
-ACE_HAS_SVR4_TIME			Platform supports the SVR4 timestruc_t type
+ACE_HAS_SVR4_TIME			Platform supports the SVR4 timestruc_t type. NOTE: This macro is obsolete, ACE only uses timespec_t.
 ACE_HAS_SVR4_TLI			Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)...
 ACE_HAS_SYSCALL_GETRUSAGE		HP/UX has an undefined syscall for GETRUSAGE...
 ACE_HAS_SYSCALL_H			Compiler/platform contains the <sys/syscall.h> file.
diff --git a/ace/config-irix6.2-sgic++-nothreads.h b/ace/config-irix6.2-sgic++-nothreads.h
deleted file mode 100644
index 60cfbb2d61f..00000000000
--- a/ace/config-irix6.2-sgic++-nothreads.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for the SGI
-// Indigo2EX running IRIX 6.2 platform using the SGI C++ Compiler
-// *without* using SGI Pthreads (e.g., if you are still using sprocs).
-
-#if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
-
-#define ACE_HAS_P_READ_WRITE
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_HAS_SETOWN
-#define ACE_HAS_SYSENT_H
-#define ACE_HAS_SYSINFO
-
-// Include XtReactor into the library.
-#define ACE_HAS_XT
-
-#define ACE_LACKS_SIGNED_CHAR
-// Platform supports getpagesize() call.
-#define ACE_HAS_GETPAGESIZE
-
-// Platform supports reentrant functions (i.e., all the POSIX *_r
-// functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant password file accessor functiions.
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant netdb functions (getprotobyname_r,
-// getprotobynumber_r, gethostbyaddr_r, gethostbyname_r,
-// getservbyname_r).
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-
-//Sockets may be called in multi-threaded programs
-#define ACE_HAS_MT_SAFE_SOCKETS
-
-// Platform supports the tid_t type (e.g., AIX and Irix 6.2)
-#define ACE_HAS_TID_T
-
-// uses ctime_r & asctime_r with only two parameters vs. three
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-// Platform has no implementation of pthread_condattr_setpshared(),
-// even though it supports pthreads! (like Irix 6.2)
-#define ACE_LACKS_CONDATTR_PSHARED
-
-#define ACE_LACKS_RWLOCK_T
-
-// Platform/compiler has the sigwait(2) prototype
-#define ACE_HAS_SIGWAIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
-
-// Platform requires void * for mmap().
-#define ACE_HAS_VOIDPTR_MMAP
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Irix needs to define bzero() in this odd file <bstring.h>
-#define ACE_HAS_BSTRING
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Denotes that Irix has second argument to gettimeofday() which is
-// variable (...)
-#define ACE_HAS_IRIX_GETTIMEOFDAY
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK 
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME 
-#define ACE_HAS_SVR4_TIME
-#define ACE_NEEDS_SYSTIME_H
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS 
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL 
-
-// No multi-threading so use poll() call 
-// - for easier debugging, if nothing else 
-// #define ACE_USE_POLL
-
-// Platform supports the /proc file system.
-#define ACE_HAS_PROC_FS 
-
-// 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 supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T 
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS 
-
-// Platform supports STREAM pipes (note that this is disabled by
-// default, see the manual page on pipe(2) to find out how to enable
-// it). 
-// #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 
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H 
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN 
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.2-sgic++.h b/ace/config-irix6.2-sgic++.h
deleted file mode 100644
index 691b16e3fe4..00000000000
--- a/ace/config-irix6.2-sgic++.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for the SGI
-// Indigo2EX running IRIX 6.2 platform using the SGI C++ Compiler.
-
-// In order to have support for multi-threading, several patches must
-// be applied to the stock Irix 6.2 kernel, involving changes that
-// bring this kernel up to POSIX 1003.c compatibility.  These patches
-// are updated frequently, so you should ask your support contact or
-// search SGI's web site (http://www.sgi.com) for the latest version.
-
-#if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
-
-// Platform supports template specialization
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-#define ACE_HAS_EXCEPTIONS
-#define ACE_LACKS_SIGNED_CHAR
-#define ACE_HAS_P_READ_WRITE
-#define ACE_HAS_IRIX62_THREADS
-#define ACE_HAS_PTHREAD_SIGMASK
-
-// Needed for the threading stuff?
-#include /**/ <sched.h>
-#include /**/ <task.h>
-#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN
-#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX
-
-// ACE supports threads.
-#define ACE_HAS_THREADS
-
-// Include XtReactor into the library.
-#define ACE_HAS_XT
-
-// Platform supports getpagesize() call.
-#define ACE_HAS_GETPAGESIZE
-
-// Platform supports reentrant functions (i.e., all the POSIX *_r
-// functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant password file accessor functiions.
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant netdb functions (getprotobyname_r,
-// getprotobynumber_r, gethostbyaddr_r, gethostbyname_r,
-// getservbyname_r).
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-
-//Sockets may be called in multi-threaded programs
-#define ACE_HAS_MT_SAFE_SOCKETS
-
-// Compiler/platform has thread-specific storage
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// Compile using multi-thread libraries
-#if !defined (ACE_MT_SAFE)
-	#define ACE_MT_SAFE 1
-#endif
-
-// Platform supports the tid_t type (e.g., AIX and Irix 6.2)
-#define ACE_HAS_TID_T
-
-// uses ctime_r & asctime_r with only two parameters vs. three
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-// Platform has no implementation of pthread_condattr_setpshared(),
-// even though it supports pthreads! (like Irix 6.2)
-#define ACE_LACKS_CONDATTR_PSHARED
-
-// Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, OSF/1 3.2,
-// Irix 6.2)
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
-#define ACE_HAS_PTHREADS
-
-// Platform has pthread_equal().
-#define ACE_HAS_PTHREAD_EQUAL
-
-// Platform has pthread_t defined.
-#define ACE_HAS_PTHREAD_T
-
-// Platform lacks readers/writer locks.
-#define ACE_LACKS_RWLOCK_T
-
-// Platform/compiler has the sigwait(2) prototype
-#define ACE_HAS_SIGWAIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
-
-// Platform requires void * for mmap().
-#define ACE_HAS_VOIDPTR_MMAP
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Platform provides <sysent.h> header
-#define ACE_HAS_SYSENT_H
-
-// Platform supports system configuration information
-#define ACE_HAS_SYSINFO
-
-// Compiler implements templates that support typedefs inside of
-// classes used as formal arguments to a template class.
-// #define ACE_HAS_TEMPLATE_TYPEDEFS
-
-// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Irix needs to define bzero() in this odd file <bstring.h>
-#define ACE_HAS_BSTRING
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Denotes that Irix has second argument to gettimeofday() which is
-// variable (...)
-#define ACE_HAS_IRIX_GETTIMEOFDAY
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK 
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME 
-#define ACE_HAS_SVR4_TIME
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS 
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL 
-
-// No multi-threading so use poll() call 
-// - for easier debugging, if nothing else 
-// #define ACE_USE_POLL
-
-// Platform supports the /proc file system.
-#define ACE_HAS_PROC_FS 
-
-// 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 supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T 
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS 
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-// Platform supports STREAM pipes (note that this is disabled by
-// default, see the manual page on pipe(2) to find out how to enable
-// it). 
-// #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 
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H 
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN 
-
-// Compiler/platform defines the F_SETOWN macro
-#define ACE_HAS_SETOWN 
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.4-sgic++-nothreads.h b/ace/config-irix6.4-sgic++-nothreads.h
deleted file mode 100644
index 33c902348ac..00000000000
--- a/ace/config-irix6.4-sgic++-nothreads.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for the SGI
-// Indigo2EX running IRIX 6.2 platform using the SGI C++ Compiler
-// *without* using SGI Pthreads (e.g., if you are still using sprocs).
-
-#if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
-
-#define ACE_HAS_P_READ_WRITE
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_HAS_SETOWN
-#define ACE_HAS_SYSENT_H
-#define ACE_HAS_SYSINFO
-
-// Include XtReactor into the library.
-#define ACE_HAS_XT
-
-#define ACE_LACKS_SIGNED_CHAR
-// Platform supports getpagesize() call.
-#define ACE_HAS_GETPAGESIZE
-
-// Platform supports reentrant functions (i.e., all the POSIX *_r
-// functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant password file accessor functiions.
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant netdb functions (getprotobyname_r,
-// getprotobynumber_r, gethostbyaddr_r, gethostbyname_r,
-// getservbyname_r).
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-
-//Sockets may be called in multi-threaded programs
-#define ACE_HAS_MT_SAFE_SOCKETS
-
-// Platform supports the tid_t type (e.g., AIX and Irix 6.2)
-#define ACE_HAS_TID_T
-
-// uses ctime_r & asctime_r with only two parameters vs. three
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-// Platform has no implementation of pthread_condattr_setpshared(),
-// even though it supports pthreads! (like Irix 6.2)
-#define ACE_LACKS_CONDATTR_PSHARED
-
-#define ACE_LACKS_RWLOCK_T
-
-// Platform/compiler has the sigwait(2) prototype
-#define ACE_HAS_SIGWAIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
-
-// Platform requires void * for mmap().
-#define ACE_HAS_VOIDPTR_MMAP
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Irix needs to define bzero() in this odd file <bstring.h>
-#define ACE_HAS_BSTRING
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Denotes that Irix has second argument to gettimeofday() which is
-// variable (...)
-#define ACE_HAS_IRIX_GETTIMEOFDAY
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK 
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME 
-// #define ACE_HAS_SVR4_TIME
-#define ACE_NEEDS_SYSTIME_H
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS 
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL 
-
-// No multi-threading so use poll() call 
-// - for easier debugging, if nothing else 
-// #define ACE_USE_POLL
-
-// Platform supports the /proc file system.
-#define ACE_HAS_PROC_FS 
-
-// 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 supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T 
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS 
-
-// Platform supports STREAM pipes (note that this is disabled by
-// default, see the manual page on pipe(2) to find out how to enable
-// it). 
-// #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 
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H 
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN 
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// The following three should be enabled/disabled together.
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_REQUIRES_FUNC_DEFINITIONS
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.4-sgic++.h b/ace/config-irix6.4-sgic++.h
deleted file mode 100644
index 0a0c956fb16..00000000000
--- a/ace/config-irix6.4-sgic++.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for the SGI
-// Indigo2EX running IRIX 6.2 platform using the SGI C++ Compiler.
-
-// In order to have support for multi-threading, several patches must
-// be applied to the stock Irix 6.2 kernel, involving changes that
-// bring this kernel up to POSIX 1003.c compatibility.  These patches
-// are updated frequently, so you should ask your support contact or
-// search SGI's web site (http://www.sgi.com) for the latest version.
-
-#if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
-
-#define ACE_LACKS_SIGNED_CHAR
-#define ACE_HAS_P_READ_WRITE
-#define ACE_HAS_IRIX62_THREADS
-#define ACE_HAS_PTHREAD_SIGMASK
-
-// Needed for the threading stuff?
-#include /**/ <sched.h>
-#include /**/ <task.h>
-#define PTHREAD_MIN_PRIORITY PX_PRIO_MIN
-#define PTHREAD_MAX_PRIORITY PX_PRIO_MAX
-
-// ACE supports threads.
-#define ACE_HAS_THREADS
-
-// Include XtReactor into the library.
-#define ACE_HAS_XT
-
-// Platform supports getpagesize() call.
-#define ACE_HAS_GETPAGESIZE
-
-// Platform supports reentrant functions (i.e., all the POSIX *_r
-// functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant password file accessor functiions.
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
-
-// Platform does not support reentrant netdb functions (getprotobyname_r,
-// getprotobynumber_r, gethostbyaddr_r, gethostbyname_r,
-// getservbyname_r).
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-
-//Sockets may be called in multi-threaded programs
-#define ACE_HAS_MT_SAFE_SOCKETS
-
-// Compiler/platform has thread-specific storage
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// Compile using multi-thread libraries
-#if !defined (ACE_MT_SAFE)
-	#define ACE_MT_SAFE 1
-#endif
-
-// Platform supports the tid_t type (e.g., AIX and Irix 6.2)
-#define ACE_HAS_TID_T
-
-// uses ctime_r & asctime_r with only two parameters vs. three
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-// Platform has no implementation of pthread_condattr_setpshared(),
-// even though it supports pthreads! (like Irix 6.2)
-#define ACE_LACKS_CONDATTR_PSHARED
-
-// Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, OSF/1 3.2,
-// Irix 6.2)
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
-#define ACE_HAS_PTHREADS
-
-// Platform has pthread_equal().
-#define ACE_HAS_PTHREAD_EQUAL
-
-// Platform has pthread_t defined.
-#define ACE_HAS_PTHREAD_T
-
-// Platform lacks readers/writer locks.
-#define ACE_LACKS_RWLOCK_T
-
-// Platform/compiler has the sigwait(2) prototype
-#define ACE_HAS_SIGWAIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC			
-
-// Platform requires void * for mmap().
-#define ACE_HAS_VOIDPTR_MMAP
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Platform provides <sysent.h> header
-#define ACE_HAS_SYSENT_H
-
-// Platform supports system configuration information
-#define ACE_HAS_SYSINFO
-
-// Compiler implements templates that support typedefs inside of
-// classes used as formal arguments to a template class.
-// #define ACE_HAS_TEMPLATE_TYPEDEFS
-
-// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA 
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Irix needs to define bzero() in this odd file <bstring.h>
-#define ACE_HAS_BSTRING
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Denotes that Irix has second argument to gettimeofday() which is
-// variable (...)
-#define ACE_HAS_IRIX_GETTIMEOFDAY
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK 
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME 
-// #define ACE_HAS_SVR4_TIME
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS 
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL 
-
-// No multi-threading so use poll() call 
-// - for easier debugging, if nothing else 
-// #define ACE_USE_POLL
-
-// Platform supports the /proc file system.
-#define ACE_HAS_PROC_FS 
-
-// 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 supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T 
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS 
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-// Platform supports STREAM pipes (note that this is disabled by
-// default, see the manual page on pipe(2) to find out how to enable
-// it). 
-// #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 
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H 
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN 
-
-// Compiler/platform defines the F_SETOWN macro
-#define ACE_HAS_SETOWN 
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Platform supports template specialization
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-// Platform supports exceptions.
-#define ACE_HAS_EXCEPTIONS
-
-// The following three should be enabled/disabled together.
-#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_REQUIRES_FUNC_DEFINITIONS
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index f60af95f0d5..2372bfc3270 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -1,13 +1,16 @@
 /* -*- C++ -*- */
 // $Id$
 
-// For IRIX 6.[234] without pthreads support.
-// Note: Exceptions are supported in -n32 mode.
+// NOTE: THIS IS NOT A COMPLETE CONFIG FILE.
+
+// The following configuration file keeps the common part to IRIX 6.2,
+// 6.4 and hopefully 6.3 config files.
+// Any difference is covered in the config-irix6.{2,4} files.
 
 // For IRIX 6.2 there are several patches that should be applied to
-// get reliable operation with exceptions.
-// Specifically you should get a reasonable current IRIX and Compiler
-// patch-sets (and the POSIX patch-set definitely doesn't hurt!)
+// get reliable operation with multi-threading and exceptions.
+// Specifically you should get a reasonable current IRIX, Compiler
+// and POSIX patch-sets.
 
 // For IRIX 6.[34] it's less critical, but it's still recommended
 // that you apply the applicable patch-sets (IRIX and Compiler I believe).
@@ -16,29 +19,21 @@
 // contact or search SGI's web site (http://www.sgi.com) for the latest
 // version.
 
+// Since this files gets included from several config file we cannot
+// call it the true config.h file.
+#if !defined (ACE_CONFIG_IRIX6X_NTHR_H)
+#define ACE_CONFIG_IRIX6X_NTHR_H
 
-#if !defined (ACE_CONFIG_H)
-#define ACE_CONFIG_H
-
-// Platform supports template specialization
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-// -n32 and -64 supports exceptions by default (we don't use -64 now,
-// but it's easy to test for.
-#ifdef _MIPS_SIM
-#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64
-#define ACE_HAS_EXCEPTIONS
-#endif
-#endif
-
-
-#define ACE_LACKS_SIGNED_CHAR
 #define ACE_HAS_P_READ_WRITE
-
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF
+#define ACE_HAS_SETOWN
+#define ACE_HAS_SYSENT_H
+#define ACE_HAS_SYSINFO
 
 // Include XtReactor into the library.
 #define ACE_HAS_XT
 
+#define ACE_LACKS_SIGNED_CHAR
 // Platform supports getpagesize() call.
 #define ACE_HAS_GETPAGESIZE
 
@@ -63,7 +58,10 @@
 // uses ctime_r & asctime_r with only two parameters vs. three
 #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 
-// Platform lacks readers/writer locks.
+// Platform has no implementation of pthread_condattr_setpshared(),
+// even though it supports pthreads! (like Irix 6.2)
+#define ACE_LACKS_CONDATTR_PSHARED
+
 #define ACE_LACKS_RWLOCK_T
 
 // Platform/compiler has the sigwait(2) prototype
@@ -81,16 +79,6 @@
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYSCALL_H
 
-// Platform provides <sysent.h> header
-#define ACE_HAS_SYSENT_H
-
-// Platform supports system configuration information
-#define ACE_HAS_SYSINFO
-
-// Compiler implements templates that support typedefs inside of
-// classes used as formal arguments to a template class.
-// #define ACE_HAS_TEMPLATE_TYPEDEFS
-
 // Compiler/platform supports alloca()
 #define ACE_HAS_ALLOCA 
 
@@ -111,10 +99,9 @@
 #define ACE_HAS_POSIX_NONBLOCK 
 
 // Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME
+#define ACE_HAS_POSIX_TIME 
+// #define ACE_HAS_SVR4_TIME
 #define ACE_NEEDS_SYSTIME_H
-// Huh?? Removed in 6.4??
-#define ACE_HAS_SVR4_TIME
 
 // Compiler/platform has correctly prototyped header files.
 #define ACE_HAS_CPLUSPLUS_HEADERS 
@@ -142,8 +129,6 @@
 // Platform supports STREAMS.
 #define ACE_HAS_STREAMS 
 
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
 // Platform supports STREAM pipes (note that this is disabled by
 // default, see the manual page on pipe(2) to find out how to enable
 // it). 
@@ -167,21 +152,32 @@
 // Compiler/platform defines a union semun for SysV shared memory.
 #define ACE_HAS_SEMUN 
 
-// Compiler/platform defines the F_SETOWN macro
-#define ACE_HAS_SETOWN 
-
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
-// Does this work on 6.2???
 // The following three should be enabled/disabled together.
 #define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 #define ACE_REQUIRES_FUNC_DEFINITIONS
 
+// Platform supports exceptions. Under 6.2 this requires an extra flag
+// for the compiler, don't worry is already there in
+// platform_irix6.x.GNU
+#define ACE_HAS_EXCEPTIONS
+
+// Platform supports STREAM pipes (note that this is disabled by
+// default, see the manual page on pipe(2) to find out how to enable
+// it). 
+// #define ACE_HAS_STREAM_PIPES 
+
+// Platform supports POSIX timers via timestruc_t.
+// This will *NOT* work in 6.4, but ACE doesn't use it anymore.
+// #define ACE_HAS_POSIX_TIME 
+// #define ACE_HAS_SVR4_TIME
+
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 #define ACE_NTRACE 1
 #endif /* ACE_NTRACE */
 
-#endif /* ACE_CONFIG_H */
+#endif /* ACE_CONFIG_IRIX6X_NTHR_H */
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index 166a08c9490..9b3ca31d39f 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -1,26 +1,16 @@
 /* -*- C++ -*- */
 // $Id$
 
-// For IRIX 6.[234] with pthreads support.
-// Note: Exceptions are supported in -n32 mode.
-// You can select between -32 (aka -o32) and -n32 mode by selecting either
-// platform_irix6.x-32_sgic++.GNU or platform_irix6.x-n32_sgic++.GNU
+// NOTE: THIS IS NOT A COMPLETE CONFIG FILE.
 
-// For IRIX 6.2 there are several patches that should be applied to
-// get reliable operation with multi-threading and exceptions.
-// Specifically you should get a reasonable current IRIX, Compiler
-// and POSIX patch-sets.
+// Here we setup the common config for IRIX 6.2, 6.4 and hopefully 6.3
+// but with pthreads enabled.
 
-// For IRIX 6.[34] it's less critical, but it's still recommended
-// that you apply the applicable patch-sets (IRIX and Compiler I believe).
+// This file is automatically included in several irix6.* config
+// files, but is *not* included in the irix6.2-nothreads file.
 
-// These patches are updated frequently, so you should ask your support
-// contact or search SGI's web site (http://www.sgi.com) for the latest
-// version.
-
-// NOTE: We can't call this ACE_CONFIG_H, it's used by an included header file!
-#if !defined (ACE_IRIX6_CONFIG_H)
-#define ACE_IRIX6_CONFIG_H
+#if !defined (ACE_CONFIG_IRIX6X_H)
+#define ACE_CONFIG_IRIX6X_H
 
 // Include basic (non-threaded) configuration
 #include <ace/config-irix6.x-sgic++-nothreads.h>
@@ -64,4 +54,4 @@
   #define ACE_MT_SAFE 1
 #endif /* ACE_MT_SAFE */
 
-#endif /* ACE_IRIX6_CONFIG_H */
+#endif /* ACE_CONFIG_IRIX6X_H */