Commit c2f239d9 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

uml: fix prototypes



Declare strlcpy and strlcat more correctly.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b7ec15bd
...@@ -14,6 +14,11 @@ ...@@ -14,6 +14,11 @@
*/ */
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
/*
* This will provide the size_t definition in both kernel and userspace builds
*/
#include <linux/types.h>
extern void panic(const char *fmt, ...) extern void panic(const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (printf, 1, 2)));
extern int printk(const char *fmt, ...) extern int printk(const char *fmt, ...)
...@@ -21,8 +26,7 @@ extern int printk(const char *fmt, ...) ...@@ -21,8 +26,7 @@ extern int printk(const char *fmt, ...)
extern void schedule(void); extern void schedule(void);
extern int in_aton(char *str); extern int in_aton(char *str);
extern int open_gdb_chan(void); extern int open_gdb_chan(void);
/* These use size_t, however unsigned long is correct on both i386 and x86_64. */ extern size_t strlcpy(char *, const char *, size_t);
extern unsigned long strlcpy(char *, const char *, unsigned long); extern size_t strlcat(char *, const char *, size_t);
extern unsigned long strlcat(char *, const char *, unsigned long);
#endif #endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment