* config/locale/c_locale_generic.cc: Do not trust

	_GLIBCPP_HAVE_STRTOF or _GLIBCPP_HAVE_STRTOLD as
	set by configure.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49558 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2c36b31..fdc204f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
 2002-02-06  Loren Rittle <ljrittle@acm.org>
 
 2002-02-06  Loren Rittle <ljrittle@acm.org>
 

+       * config/locale/c_locale_generic.cc: Do not trust
+       _GLIBCPP_HAVE_STRTOF or _GLIBCPP_HAVE_STRTOLD as
+       set by configure.
+
+2002-02-06  Loren Rittle <ljrittle@acm.org>
+

        * acinclude.m4: Add C++ linkage check for strtof.
        * aclocal.m4: Rebuilt.
        * config.h.in: Rebuilt.
        * acinclude.m4: Add C++ linkage check for strtof.
        * aclocal.m4: Rebuilt.
        * config.h.in: Rebuilt.

diff --git a/libstdc++-v3/config/locale/c_locale_generic.cc b/libstdc++-v3/config/locale/c_locale_generic.cc
index e470f1a..245b5b2 100644 (file)
--- a/libstdc++-v3/config/locale/c_locale_generic.cc
+++ b/libstdc++-v3/config/locale/c_locale_generic.cc
@@ -123,7 +123,7 @@ namespace std
          const char* __old = setlocale(LC_ALL, "C");
          char* __sanity;
          errno = 0;
          const char* __old = setlocale(LC_ALL, "C");
          char* __sanity;
          errno = 0;

-#if defined(_GLIBCPP_USE_C99) || defined(_GLIBCPP_HAVE_STRTOF)
+#if defined(_GLIBCPP_USE_C99)

          float __f = strtof(__s, &__sanity);
 #else
          double __d = strtod(__s, &__sanity);
          float __f = strtof(__s, &__sanity);
 #else
          double __d = strtod(__s, &__sanity);


@@ -179,7 +179,7 @@ namespace std
        {
          // Assumes __s formatted for "C" locale.
          const char* __old = setlocale(LC_ALL, "C");
        {
          // Assumes __s formatted for "C" locale.
          const char* __old = setlocale(LC_ALL, "C");

-#if defined(_GLIBCPP_USE_C99) || defined(_GLIBCPP_HAVE_STRTOLD)
+#if defined(_GLIBCPP_USE_C99)

          char* __sanity;
          errno = 0;
          long double __ld = strtold(__s, &__sanity);
          char* __sanity;
          errno = 0;
          long double __ld = strtold(__s, &__sanity);