diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c98a2db368b..13ffd4eeff9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* testsuite/testsuite_hooks.cc (__set_testsuite_memlimit): Use
+	__typeof__ (r.rlim_cur), not rlim_t in declaration of limit.
+
 2002-10-23  Jakub Jelinek  <jakub@redhat.com>
 
 	* testsuite/22_locale/num_put_members_char.cc (test01): Swap size
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc
index 4e6c8319637..0af2bd1c74e 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/testsuite_hooks.cc
@@ -38,7 +38,9 @@ void
 __set_testsuite_memlimit(float __size)
 {
     struct rlimit r;
-    rlim_t limit = (rlim_t)(__size * 1048576);
+    // Cater to the absence of rlim_t.
+    __typeof__ (r.rlim_cur) limit
+      = (__typeof__ (r.rlim_cur))(__size * 1048576);
 
     // Heap size, seems to be common.
 #if _GLIBCPP_HAVE_MEMLIMIT_DATA