--- strhelper.cxx	2005-01-31 09:59:44.000000000 +0100
+++ strhelper_new.cxx	2005-05-11 14:50:15.000000000 +0200
@@ -64,17 +64,8 @@
 #include <alloca.h>
 #endif
 #include <cstdlib>
-#include <math.h> // for isnan
 #include <cstring>
-
-// isnan needs special support on MACOSX
-#if defined(MACOSX)
-#define      isnan( x )         ( ( sizeof ( x ) == sizeof(double) ) ?    \
-                              __isnand ( x ) :                            \
-                                ( sizeof ( x ) == sizeof( float) ) ?      \
-                              __isnanf ( x ) :                            \
-                              __isnan  ( x ) )
-#endif
+#include <rtl/math.hxx>
 
 #if defined (FREEBSD)
 using namespace __gnu_cxx;  //for isnan #iz27753 for FreeBSD
@@ -660,7 +651,7 @@
         return 3;
     }
 
-    if( isnan( f ) )
+    if( ::rtl::math::isNan( f ) )
     {
         strncpy( pBuffer, "NaN", 3 );
         return 3;