diff --git a/ChangeLog b/ChangeLog
index c6429e6c87..80f9768471 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-26  Greg McGary  <greg@mcgary.org>
 
+	* string/bits/string2.h: Inhibit inlines if __BOUNDED_POINTERS__.
+
 	* sysdeps/unix/sysv/linux/syscalls.list: Add missing signatures.
 	Remove clock_* and timer_* entries.
 	* sysdeps/unix/sysv/linux/powerpc/syscalls.list: Replace
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 223c36e8df..897b5d5b24 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -22,7 +22,7 @@
 # error "Never use <bits/string2.h> directly; include <string.h> instead."
 #endif
 
-#ifndef __NO_STRING_INLINES
+#if !defined __NO_STRING_INLINES && !__BOUNDED_POINTERS__
 
 /* Unlike the definitions in the header <bits/string.h> the
    definitions contained here are not optimized down to assembler