diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1332b8021173..b58258003e88 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 22 09:52:41 2001  Jeffrey A Law  (law@redhat.com)
+
+        * config/os/hpux/bits/os_defines.h: Update to avoid #defines
+        for strtoll and strtoull.
+
 Fri Dec 21 17:35:21 2001  Jeffrey A Law  (law@redhat.com)
 
 	* config/os/hpux/bits/os_defines.h: Include <sys/_inttypes.h.
diff --git a/libstdc++-v3/config/os/hpux/bits/os_defines.h b/libstdc++-v3/config/os/hpux/bits/os_defines.h
index 323c0c66d71b..322bb5685670 100644
--- a/libstdc++-v3/config/os/hpux/bits/os_defines.h
+++ b/libstdc++-v3/config/os/hpux/bits/os_defines.h
@@ -61,8 +61,12 @@
    We also force _GLIBCPP_USE_LONG_LONG here so that we don't have
    to bastardize configure to deal with this sillyness.  */
 #include <sys/_inttypes.h>
-#define strtoll __strtoll
-#define strtoull __strtoull
+namespace std {
+  extern "C" long long strtoll (const char *, char **, int)
+    __asm  ("__strtoll");
+  extern "C" long long strtoull (const char *, char **, int)
+    __asm  ("__strtoull");
+}
 extern intmax_t __strtoll (const char *, char**, int);
 extern uintmax_t __strtoull (const char *, char**, int);
 #define _GLIBCPP_USE_LONG_LONG 1