diff --git a/configure.ac b/configure.ac
index c73fb1ad2..5a3862e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,11 +75,15 @@ fi
 AC_HEADER_STDC
 AC_HEADER_TIME
 
-AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename strcasecmp localtime_r posix_fallocate memmem])
+AC_CHECK_FUNCS([lrintf strlcpy daemon dirname basename strcasecmp localtime_r posix_fallocate memmem strtold])
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 ACX_PTHREAD
 
+if test "x$ac_cv_func_strtold" != "xyes" ; then
+    CPPFLAGS="$CPPFLAGS -Dstrtold=strtod"
+fi
+
 AC_SEARCH_LIBS(cos, [m])
 AC_SEARCH_LIBS([socket], [socket net])
 AC_SEARCH_LIBS([gethostbyname], [nsl bind])
@@ -335,7 +339,7 @@ have_darwin="no"
 have_msw="no"
 case $host_os in
 
-   *cygwin|*mingw32*)
+   *mingw32*)
      have_msw="yes"
      CXXFLAGS="$CXXFLAGS -mms-bitfields -mwin32 -mwindows"
      CPPFLAGS="$CPPFLAGS -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN"