From 0c2fb0ad7ad38d04ae52be5e01c0f099064747ed Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Sun, 6 May 2007 14:51:52 -0700 Subject: [PATCH] --- yaml --- r: 54333 b: refs/heads/master c: c2f239d93e8af991392871c57465cb2ac556b482 h: refs/heads/master i: 54331: 7274eaa3bd879a2e03e2f05309f8c50211d5d9f2 v: v3 --- [refs] | 2 +- trunk/arch/um/include/user.h | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a1ebf0cb8c2b..fedffa6b72fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7ec15bd004f4524bf091f851348da2ccb519e4f +refs/heads/master: c2f239d93e8af991392871c57465cb2ac556b482 diff --git a/trunk/arch/um/include/user.h b/trunk/arch/um/include/user.h index a6da62608254..d380e6d91a90 100644 --- a/trunk/arch/um/include/user.h +++ b/trunk/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 + 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