diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 18:41:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 18:41:40 +0100 |
| commit | 3cbb90a9cb7854b1110663919d5bc3da3f46d5e3 (patch) | |
| tree | b7bf16e3e9b44dfaa7d5bff3c612a6ab72bd7169 | |
| parent | Merge branch 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro... (diff) | |
| download | linux-3cbb90a9cb7854b1110663919d5bc3da3f46d5e3.tar.xz linux-3cbb90a9cb7854b1110663919d5bc3da3f46d5e3.zip | |
powerpc: fix strncasecmp prototype
It takes a size_t, not an int, as its third argument.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/powerpc/lib/strcase.c | 4 | ||||
| -rw-r--r-- | include/asm-powerpc/string.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/lib/strcase.c b/arch/powerpc/lib/strcase.c index 36b521091bbc..f8ec1eba3fdd 100644 --- a/arch/powerpc/lib/strcase.c +++ b/arch/powerpc/lib/strcase.c @@ -1,4 +1,6 @@ +#include <linux/types.h> #include <linux/ctype.h> +#include <linux/string.h> int strcasecmp(const char *s1, const char *s2) { @@ -11,7 +13,7 @@ int strcasecmp(const char *s1, const char *s2) return c1 - c2; } -int strncasecmp(const char *s1, const char *s2, int n) +int strncasecmp(const char *s1, const char *s2, size_t n) { int c1, c2; diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h index 8606a696c088..faa407f33c6b 100644 --- a/include/asm-powerpc/string.h +++ b/include/asm-powerpc/string.h @@ -15,7 +15,7 @@ #define __HAVE_ARCH_MEMCHR extern int strcasecmp(const char *, const char *); -extern int strncasecmp(const char *, const char *, int); +extern int strncasecmp(const char *, const char *, __kernel_size_t); extern char * strcpy(char *,const char *); extern char * strncpy(char *,const char *, __kernel_size_t); extern __kernel_size_t strlen(const char *); |