diff src/sysdep.cc @ 967:b228d6cd59a1

[project @ 1994-12-10 00:15:41 by jwe]
author jwe
date Sat, 10 Dec 1994 00:16:09 +0000
parents b527f7cdcc68
children 032fcf9f45a4
line wrap: on
line diff
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -120,11 +120,9 @@
 
 #if defined (HAVE_INFINITY)
   octave_Inf = (double) infinity ();
-#else
-#ifdef linux
+#elif defined (linux)
   octave_Inf = HUGE_VAL;
-#else
-#ifdef __alpha__
+#elif defined (__alpha__)
   extern unsigned int DINFINITY[2];
   octave_Inf =  (*((double *) (DINFINITY)));
 #else
@@ -138,23 +136,17 @@
       tmp = octave_Inf;
     }
 #endif
-#endif
-#endif
 
 #if defined (HAVE_QUIET_NAN)
   octave_NaN = (double) quiet_nan ();
-#else
-#ifdef linux
+#elif defined (linux)
   octave_NaN = NAN;
-#else
-#ifdef __alpha__
+#elif defined (__alpha__)
   extern unsigned int DQNAN[2];
   octave_NaN = (*((double *) (DQNAN)));
 #else
   octave_NaN = octave_Inf / octave_Inf;
 #endif
-#endif
-#endif
 
 #else
 
@@ -198,7 +190,7 @@
 void
 sysdep_init (void)
 {
-#if defined (HAVE_FPSETMASK)
+#if defined (HAVE_FPSETMASK) && defined (HAVE_FLOATINGPOINT_H)
 #if defined (__386BSD__) || defined (__FreeBSD__)
 // Disable trapping on common exceptions.
   fpsetmask (~(FP_X_OFL|FP_X_INV|FP_X_DZ|FP_X_DNML|FP_X_UFL|FP_X_IMP));