X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtod.c;h=81e9f8a9d712862224b2dd0d599c2d9263549ad5;hb=ea12546cdee0548bded92ecffcf257aa5b6a125f;hp=e2ddaa6cd891a7f46c7b302a70f401bec6ac0192;hpb=37f27c1b74b966c83e6fd2ffa74ed8817bf00e6e;p=gnulib.git

diff --git a/lib/strtod.c b/lib/strtod.c
index e2ddaa6cd..81e9f8a9d 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 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
@@ -14,8 +14,8 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
 #include <errno.h>
@@ -24,23 +24,34 @@ extern int errno;
 #endif
 
 #include <ctype.h>
+
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
+#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>
 
-#ifdef HAVE_FLOAT_H
-#include <float.h>
+#if HAVE_FLOAT_H
+# include <float.h>
 #else
-#define DBL_MAX 1.7976931348623159e+308
-#define DBL_MIN 2.2250738585072010e-308
+# define DBL_MAX 1.7976931348623159e+308
+# define DBL_MIN 2.2250738585072010e-308
 #endif
 
 #if STDC_HEADERS
-#include <stdlib.h>
-#include <string.h>
+# include <stdlib.h>
+# include <string.h>
 #else
-#define NULL 0
-#ifndef HUGE_VAL
-#define HUGE_VAL HUGE
-#endif
+# define NULL 0
+# ifndef HUGE_VAL
+#  define HUGE_VAL HUGE
+# endif
 #endif
 
 /* Convert NPTR to a double.  If ENDPTR is not NULL, a pointer to the
@@ -71,7 +82,7 @@ strtod (nptr, endptr)
   s = nptr;
 
   /* Eat whitespace.  */
-  while (isspace (*s))
+  while (ISSPACE (*s))
     ++s;
 
   /* Get the sign.  */
@@ -85,7 +96,7 @@ strtod (nptr, endptr)
   exponent = 0;
   for (;; ++s)
     {
-      if (isdigit (*s))
+      if (ISDIGIT (*s))
 	{
 	  got_digit = 1;
 
@@ -118,7 +129,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;