* gcc/libstdc++-v3/config/os/hpux/bits/os_defines.h

	(strtoll, strtoull): In 64 bit mode HP-UX (IA64 and HPPA)
	does not define strtoll or strtoull, but does define strtol
	and strtoul which are the same since in 64 bit mode
	sizeof(long) == sizeof(long long).

From-SVN: r52247

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index b552f4f68220b3fd63b104ac0db5206b4a500395..1611797b14a7909f7b76f19fd8ebac756be21a7a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-12  Steve Ellcey  <sje@cup.hp.com>
+
+       * gcc/libstdc++-v3/config/os/hpux/bits/os_defines.h
+       (strtoll, strtoull): In 64 bit mode HP-UX (IA64 and HPPA)
+       does not define strtoll or strtoull, but does define strtol
+       and strtoul which are the same since in 64 bit mode
+       sizeof(long) == sizeof(long long).
+
 2002-04-12  Phil Edwards  <pme@gcc.gnu.org>
 
        * include/std/std_bitset.h:  Doxygenate std::bitset<>.  Clean up

diff --git a/libstdc++-v3/config/os/hpux/bits/os_defines.h b/libstdc++-v3/config/os/hpux/bits/os_defines.h
index efc5e7abf4dcad1b11d388bcd238f9406d5fe035..4bd2e05c6bac1e67271a92dc1005d22ce56566b3 100644 (file)
--- a/libstdc++-v3/config/os/hpux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/bits/os_defines.h
@@ -60,10 +60,17 @@
    We also force _GLIBCPP_USE_LONG_LONG here so that we don't have
    to bastardize configure to deal with this sillyness.  */
 namespace std {
+#ifndef __LP64__
   __extension__ extern "C" long long strtoll (const char *, char **, int)
     __asm  ("__strtoll");
   __extension__ extern "C" unsigned long long strtoull (const char *, char **, int)
     __asm  ("__strtoull");
+#else
+  __extension__ extern "C" long long strtoll (const char *, char **, int)
+    __asm  ("strtol");
+  __extension__ extern "C" unsigned long long strtoull (const char *, char **, int)
+    __asm  ("strtoul");
+#endif
 }
 #define _GLIBCPP_USE_LONG_LONG 1
 #endif