changeset 2713:eb99ed3112d9

[project @ 1997-02-21 22:34:50 by jwe]
author jwe
date Fri, 21 Feb 1997 22:34:50 +0000
parents 2ff2b536cc9d
children 9f7598c8de22
files liboctave/ChangeLog liboctave/lo-ieee.cc
diffstat 2 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Fri Feb 21 21:38:21 1997 +0000
+++ b/liboctave/ChangeLog	Fri Feb 21 22:34:50 1997 +0000
@@ -1,3 +1,8 @@
+Fri Feb 21 16:07:56 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* lo-ieee.cc (octave_ieee_init): Reorder #ifdef stuff to put
+	system-specific tests first.
+
 Thu Feb 20 02:58:05 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Version 2.0.4 released.
--- a/liboctave/lo-ieee.cc	Fri Feb 21 21:38:21 1997 +0000
+++ b/liboctave/lo-ieee.cc	Fri Feb 21 22:34:50 1997 +0000
@@ -65,16 +65,16 @@
 // Some version of gcc on some old version of Linux used to crash when
 // trying to make Inf and NaN.
 
-#if defined (HAVE_INFINITY)
+#if defined (SCO)
+  double tmp = 1.0;
+  octave_Inf = 1.0 / (tmp - tmp);
+#elif defined (__alpha__)
+  extern unsigned int DINFINITY[2];
+  octave_Inf =  (*((double *) (DINFINITY)));
+#elif defined (HAVE_INFINITY)
   octave_Inf = infinity ();
 #elif defined (linux)
   octave_Inf = HUGE_VAL;
-#elif defined (__alpha__)
-  extern unsigned int DINFINITY[2];
-  octave_Inf =  (*((double *) (DINFINITY)));
-#elif defined (SCO)
-  double tmp = 1.0;
-  octave_Inf = 1.0 / (tmp - tmp);
 #else
   double tmp = 1e+10;
   octave_Inf = tmp;
@@ -91,13 +91,13 @@
 
 #if defined (HAVE_ISNAN)
 
-#if defined (HAVE_QUIET_NAN)
-  octave_NaN = quiet_nan (0L);
-#elif defined (linux)
+#if defined (linux)
   octave_NaN = NAN;
 #elif defined (__alpha__)
   extern unsigned int DQNAN[2];
   octave_NaN = (*((double *) (DQNAN)));
+#elif defined (HAVE_QUIET_NAN)
+  octave_NaN = quiet_nan (0L);
 #else
   octave_NaN = octave_Inf / octave_Inf;
 #endif