diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2007-05-06 17:51:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:04 -0400 |
commit | c2f239d93e8af991392871c57465cb2ac556b482 (patch) | |
tree | 50a4ea12771fa995f51977160e62e0696fcad9e3 /arch/um | |
parent | b7ec15bd004f4524bf091f851348da2ccb519e4f (diff) |
uml: fix prototypes
Declare strlcpy and strlcat more correctly.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r-- | arch/um/include/user.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/um/include/user.h b/arch/um/include/user.h index a6da62608254..d380e6d91a90 100644 --- a/arch/um/include/user.h +++ b/arch/um/include/user.h | |||
@@ -14,6 +14,11 @@ | |||
14 | */ | 14 | */ |
15 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) | 15 | #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) |
16 | 16 | ||
17 | /* | ||
18 | * This will provide the size_t definition in both kernel and userspace builds | ||
19 | */ | ||
20 | #include <linux/types.h> | ||
21 | |||
17 | extern void panic(const char *fmt, ...) | 22 | extern void panic(const char *fmt, ...) |
18 | __attribute__ ((format (printf, 1, 2))); | 23 | __attribute__ ((format (printf, 1, 2))); |
19 | extern int printk(const char *fmt, ...) | 24 | extern int printk(const char *fmt, ...) |
@@ -21,8 +26,7 @@ extern int printk(const char *fmt, ...) | |||
21 | extern void schedule(void); | 26 | extern void schedule(void); |
22 | extern int in_aton(char *str); | 27 | extern int in_aton(char *str); |
23 | extern int open_gdb_chan(void); | 28 | extern int open_gdb_chan(void); |
24 | /* These use size_t, however unsigned long is correct on both i386 and x86_64. */ | 29 | extern size_t strlcpy(char *, const char *, size_t); |
25 | extern unsigned long strlcpy(char *, const char *, unsigned long); | 30 | extern size_t strlcat(char *, const char *, size_t); |
26 | extern unsigned long strlcat(char *, const char *, unsigned long); | ||
27 | 31 | ||
28 | #endif | 32 | #endif |