---

yaml --- r: 54333 b: refs/heads/master c: c2f239d h: refs/heads/master i: 54331: 7274eaa v: v3
git-mirror · May 7, 2007 · 0c2fb0a · 0c2fb0a
1 parent 5b1c07f
commit 0c2fb0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -14,15 +14,19 @@
  */
 #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, ...)
 	__attribute__ ((format (printf, 1, 2)));
 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