# HG changeset patch
# User jwe
# Date 1037038244 0
# Node ID 67ef87a80c492036c6f45923c01c8d41822a1b7f
# Parent  811ec5317aebdfa8851e48715a3dba0bf93720f1
[project @ 2002-11-11 18:10:44 by jwe]

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-11  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* lo-ieee.cc (octave_ieee_init): Check defined (__osf__) instead
+	of ! defined (linux).
+
 2002-11-09  Per Persson <persquare@mac.com>
 
 	* oct-shlib.cc (octave_dyld_shlib): New class.
diff --git a/liboctave/lo-ieee.cc b/liboctave/lo-ieee.cc
--- a/liboctave/lo-ieee.cc
+++ b/liboctave/lo-ieee.cc
@@ -53,13 +53,10 @@
 {
 #if defined (HAVE_ISINF) || defined (HAVE_FINITE)
 
-// Some version of gcc on some old version of Linux used to crash when
-// trying to make Inf and NaN.
-
 #if defined (SCO)
   double tmp = 1.0;
   octave_Inf = 1.0 / (tmp - tmp);
-#elif defined (__alpha__) && ! defined (linux)
+#elif defined (__alpha__) && defined (__osf__)
   extern unsigned int DINFINITY[2];
   octave_Inf =  (*(X_CAST(double *, DINFINITY)));
 #else
@@ -78,7 +75,7 @@
 
 #if defined (HAVE_ISNAN)
 
-#if defined (__alpha__) && ! defined (linux)
+#if defined (__alpha__) && defined (__osf__)
   extern unsigned int DQNAN[2];
   octave_NaN = (*(X_CAST(double *, DQNAN)));
 #else
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-11  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* sysdep.cc (BSD_init): Avoid failure if FP_X_DNML is not defined.
+
 2002-11-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* cutils.c: Be sure to always return buf.
diff --git a/src/sysdep.cc b/src/sysdep.cc
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -95,6 +95,9 @@
 {
 #if defined (HAVE_FLOATINGPOINT_H)
   // Disable trapping on common exceptions.
+#ifndef FP_X_DNML
+#define FP_X_DNML 0
+#endif
   fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP));
 #endif
 }