aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2007-05-06 14:51:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 12:13:04 -0700
commitc2f239d93e8af991392871c57465cb2ac556b482 (patch)
tree50a4ea12771fa995f51977160e62e0696fcad9e3 /arch
parentb7ec15bd004f4524bf091f851348da2ccb519e4f (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')
-rw-r--r--arch/um/include/user.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/um/include/user.h b/arch/um/include/user.h
index a6da6260825..d380e6d91a9 100644
--- a/arch/um/include/user.h
+++ b/arch/um/include/user.h
@@ -14,6 +14,11 @@
*/
#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, ...)
__attribute__ ((format (printf, 1, 2)));
extern int printk(const char *fmt, ...)
@@ -21,8 +26,7 @@ extern int printk(const char *fmt, ...)
extern void schedule(void);
extern int in_aton(char *str);
extern int open_gdb_chan(void);
-/* These use size_t, however unsigned long is correct on both i386 and x86_64. */
-extern unsigned long strlcpy(char *, const char *, unsigned long);
-extern unsigned long strlcat(char *, const char *, unsigned long);
+extern size_t strlcpy(char *, const char *, size_t);
+extern size_t strlcat(char *, const char *, size_t);
#endif