--- a/Float.st	Wed Feb 12 17:12:06 1997 +0100
+++ b/Float.st	Wed Feb 12 17:16:10 1997 +0100
@@ -1042,25 +1042,27 @@
 
 #ifdef IS_NAN
     if (IS_NAN(__floatVal(self))) { RETURN (true); }
-# ifdef IS_QNAN
+#endif
+#ifdef IS_QNAN
     if (IS_QNAN(__floatVal(self))) { RETURN (true); }
-# endif
-#else
+#endif
 
-# ifdef _SNANF
+#ifdef FLT_SNAN
+    if (__floatVal(self) == FLT_SNAN) { RETURN (true); }
+#endif
+#ifdef FLT_QNAN
+    if (__floatVal(self) == FLT_QNAN) { RETURN (true); }
+#endif
+
+#ifdef _SNANF
     if (__floatVal(self) == _SNAN) { RETURN (true); }
-# endif
-# ifdef _QNANF
+#endif
+#ifdef _QNANF
     if (__floatVal(self) == _QNAN) { RETURN (true); }
-# endif
+#endif
 
-# ifdef NAN
+#ifdef NAN
     if (__floatVal(self) == NAN) { RETURN (true); }
-# else
-    static double nan = 0.0 / 0.0;
-
-    if (__floatVal(self) == nan) { RETURN (true); }
-# endif
 #endif
 
 %}.
@@ -1325,6 +1327,6 @@
 !Float class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.52 1997-02-12 16:12:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Float.st,v 1.53 1997-02-12 16:15:57 cg Exp $'
 ! !
 Float initialize!