aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-06-27 00:18:27 +0000
committerGreg McGary <greg@mcgary.org>2000-06-27 00:18:27 +0000
commit7c90419b8fd37a742361a2f5e7f9fe8814f499e8 (patch)
tree4f6650d5c0b6f0bd0766f92ae31abfaf1933528d
parent22fda7661bcfc4ed8af3b2c9826b8568082a9978 (diff)
downloadglibc-7c90419b8fd37a742361a2f5e7f9fe8814f499e8.zip
glibc-7c90419b8fd37a742361a2f5e7f9fe8814f499e8.tar.gz
glibc-7c90419b8fd37a742361a2f5e7f9fe8814f499e8.tar.bz2
* string/bits/string2.h: Inhibit inlines if __BOUNDED_POINTERS__.
* string/bits/string2.h: Inhibit inlines if __BOUNDED_POINTERS__.
-rw-r--r--ChangeLog2
-rw-r--r--string/bits/string2.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c6429e6..80f9768 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 223c36e..897b5d5 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