X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtod.c;h=161f97a7b1894e074e6e7452a8332f63929ed9ea;hb=f53990f35803666791f4163e0f9d206bd8c4690e;hp=69c57a4df17f1dc7c3b3115fb038991bffe02d03;hpb=e04aaa3da60b161906ebd48b6788a98c7557b758;p=gnulib.git

diff --git a/lib/strtod.c b/lib/strtod.c
index 69c57a4df..161f97a7b 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1997, 1999, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,31 +24,27 @@ extern int errno;
 #endif
 
 #include <ctype.h>
-#include <math.h>
 
-#if HAVE_FLOAT_H
-# include <float.h>
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
 #else
-# define DBL_MAX 1.7976931348623159e+308
-# define DBL_MIN 2.2250738585072010e-308
+# define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif
 
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
-#else
-# define NULL 0
-# ifndef HUGE_VAL
-#  define HUGE_VAL HUGE
-# endif
-#endif
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
+#define TOLOWER(c) (IN_CTYPE_DOMAIN (c) ? tolower(c) : (c))
+
+#include <math.h>
+
+#include <float.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* Convert NPTR to a double.  If ENDPTR is not NULL, a pointer to the
    character after the last one used in the number is put in *ENDPTR.  */
 double
-strtod (nptr, endptr)
-     const char *nptr;
-     char **endptr;
+strtod (const char *nptr, char **endptr)
 {
   register const char *s;
   short int sign;
@@ -71,7 +67,7 @@ strtod (nptr, endptr)
   s = nptr;
 
   /* Eat whitespace.  */
-  while (isspace (*s))
+  while (ISSPACE (*s))
     ++s;
 
   /* Get the sign.  */
@@ -85,7 +81,7 @@ strtod (nptr, endptr)
   exponent = 0;
   for (;; ++s)
     {
-      if (isdigit (*s))
+      if (ISDIGIT (*s))
 	{
 	  got_digit = 1;
 
@@ -118,7 +114,7 @@ strtod (nptr, endptr)
   if (!got_digit)
     goto noconv;
 
-  if (tolower (*s) == 'e')
+  if (TOLOWER (*s) == 'e')
     {
       /* Get the exponent specified after the `e' or `E'.  */
       int save = errno;