merge & simple cleanup

1 files changed, 12 insertions, 7 deletions

diff --git a/strings/strtod.c b/strings/strtod.c
index 243322cb945..92a4700cfc4 100644
--- a/strings/strtod.c
+++ b/strings/strtod.c
@@ -36,6 +36,11 @@ static double scaler1[] = {
   1.0, 10.0, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9
 };
 
+
+#ifndef HUGE_VAL				/* Should be +Infinitive */
+#define HUGE_VAL DBL_MAX
+#endif
+
 double my_strtod(const char *str, char **end)
 {
   double result= 0.0;
@@ -92,10 +97,10 @@ double my_strtod(const char *str, char **end)
       }
       if (exp >= 1000)
       {
-        if (neg)
-          result= 0.0;
-        else
-          overflow=1;
+	if (neg)
+	  result= 0.0;
+	else
+          overflow= 1;
         goto done;
       }
       while (exp >= 100)
@@ -115,10 +120,10 @@ done:
   if (end)
     *end = (char *)str;
 
-  if (overflow || ((overflow=isinf(result))))
+  if (overflow || isinf(result))
   {
-    result=DBL_MAX;
-    errno=EOVERFLOW;
+    result= DBL_MAX;
+    errno= EOVERFLOW;
   }
 
   return negative ? -result : result;