aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2006-04-10 22:53:57 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:40 -0700
commit8833d328caf009f8da58337e17a2cf5d52993a7c (patch)
treedc12f9c94f28ad0fb41ea6c4ebe6a0ae31c36ad1 /lib
parent[PATCH] No arch-specific strpbrk implementations (diff)
downloadlinux-dev-8833d328caf009f8da58337e17a2cf5d52993a7c.tar.xz
linux-dev-8833d328caf009f8da58337e17a2cf5d52993a7c.zip
[PATCH] Clean up arch-overrides in linux/string.h
Some string functions were safely overrideable in lib/string.c, but their corresponding declarations in linux/string.h were not. Correct this, and make strcspn overrideable. Odds of someone wanting to do optimized assembly of these are small, but for the sake of cleanliness, might as well bring them into line with the rest of the file. Signed-off-by: Kyle McMartin <kyle@parisc-linux.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/string.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/string.c b/lib/string.c
index 037a48acedbb..7be6f0a87e83 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -362,6 +362,7 @@ size_t strspn(const char *s, const char *accept)
EXPORT_SYMBOL(strspn);
#endif
+#ifndef __HAVE_ARCH_STRCSPN
/**
* strcspn - Calculate the length of the initial substring of @s which does
* not contain letters in @reject
@@ -384,6 +385,7 @@ size_t strcspn(const char *s, const char *reject)
return count;
}
EXPORT_SYMBOL(strcspn);
+#endif
#ifndef __HAVE_ARCH_STRPBRK
/**