5 files changed, 29 insertions, 18 deletions
diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h
index d051b842b34..274d9564d8d 100644
--- a/ace/config-irix5.2.h
+++ b/ace/config-irix5.2.h
@@ -32,10 +32,7 @@
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
 
-// The Irix 6.x float.h doesn't allow us to distinguish between a
-// double and a long double.  So, we have to hard-code this.  We
-// assume that it is necessary on Irix 5.2 also.
-#define ACE_SIZEOF_LONG_DOUBLE 16
+#define ACE_SIZEOF_LONG_DOUBLE 8
 
 #define IRIX5
 #define ACE_HAS_ALLOCA 
diff --git a/ace/config-irix5.3-g++.h b/ace/config-irix5.3-g++.h
index d1418b44991..3feac8b3a90 100644
--- a/ace/config-irix5.3-g++.h
+++ b/ace/config-irix5.3-g++.h
@@ -9,10 +9,7 @@
 
 #include "ace/config-g++-common.h"
 
-// The Irix 6.x float.h doesn't allow us to distinguish between a
-// double and a long double.  So, we have to hard-code this.  We
-// assume that it is necessary on Irix 5.3 also.
-#define ACE_SIZEOF_LONG_DOUBLE 16
+#define ACE_SIZEOF_LONG_DOUBLE 8
 
 #define ACE_NEEDS_SYSTIME_H
 // Platform supports getpagesize() call.
diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h
index e6647422ccd..52c578a082e 100644
--- a/ace/config-irix5.3-sgic++.h
+++ b/ace/config-irix5.3-sgic++.h
@@ -13,10 +13,7 @@
 #include <sys/bsd_types.h>
 #define _BSD_TYPES
 
-// The Irix 6.x float.h doesn't allow us to distinguish between a
-// double and a long double.  So, we have to hard-code this.  We
-// assume that it is necessary on Irix 5.3 also.
-#define ACE_SIZEOF_LONG_DOUBLE 16
+#define ACE_SIZEOF_LONG_DOUBLE 8
 
 #define ACE_NEEDS_SYSTIME_H
 // Optimize ACE_Handle_Set for select().
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index 9e309e4da19..b52175681d6 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -10,9 +10,19 @@
 #include "ace/config-g++-common.h"
 
 // The Irix 6.x float.h doesn't allow us to distinguish between a
-// double and a long double.  So, we have to hard-code this.  We
-// assume that it is necessary on Irix 5.3 also.
-#define ACE_SIZEOF_LONG_DOUBLE 16
+// double and a long double.  So, we have to hard-code this.  Thanks
+// to Bob Laferriere <laferrie@gsao.med.ge.com> for figuring it out.
+#if defined (_MIPS_SIM)               // 6.X System
+# if defined (_ABI64)  &&  (_MIPS_SIM == _ABI64)
+#   define ACE_SIZEOF_LONG_DOUBLE 16
+# elif defined (_NABI32)  &&  (_MIPS_SIM == _NABI32)
+#   define ACE_SIZEOF_LONG_DOUBLE 16
+# elif defined (_ABIO32)  &&  (_MIPS_SIM == _ABIO32)
+#   define ACE_SIZEOF_LONG_DOUBLE  8
+# endif
+#else
+# define ACE_SIZEOF_LONG_DOUBLE  8    // 5.3 System
+#endif
 
 // Platform supports the very odd IRIX 6.2 threads...
 #define ACE_HAS_IRIX62_THREADS
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index 8baccdd99d3..7db41bf041c 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -22,9 +22,19 @@
 #define ACE_CONFIG_IRIX6X_NTHR_H
 
 // The Irix 6.x float.h doesn't allow us to distinguish between a
-// double and a long double.  So, we have to hard-code this.  We
-// assume that it is necessary on Irix 5.3 also.
-#define ACE_SIZEOF_LONG_DOUBLE 16
+// double and a long double.  So, we have to hard-code this.  Thanks
+// to Bob Laferriere <laferrie@gsao.med.ge.com> for figuring it out.
+#if defined (_MIPS_SIM)               // 6.X System
+# if defined (_ABI64)  &&  (_MIPS_SIM == _ABI64)
+#   define ACE_SIZEOF_LONG_DOUBLE 16
+# elif defined (_NABI32)  &&  (_MIPS_SIM == _NABI32)
+#   define ACE_SIZEOF_LONG_DOUBLE 16
+# elif defined (_ABIO32)  &&  (_MIPS_SIM == _ABIO32)
+#   define ACE_SIZEOF_LONG_DOUBLE  8
+# endif
+#else
+# define ACE_SIZEOF_LONG_DOUBLE  8    // 5.3 System
+#endif
 
 #define ACE_HAS_P_READ_WRITE
 #define ACE_LACKS_LINEBUFFERED_STREAMBUF