aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/slip_proto.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-06-08 18:48:01 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 19:21:12 -0400
commitda00d9a5466558ccd9e7b7d04b13d7cb9160c876 (patch)
tree4edc27caa63126e902da3752f58adb8ee792762c /arch/um/drivers/slip_proto.h
parent3df59529ad1045da61698bb5dd8ebaa547aeb46f (diff)
[PATCH] uml: compile fixes for gcc 4
This is a bunch of compile fixes provoked by building UML with gcc 4. There are a bunch of signedness mismatches, a couple of uninitialized references, and a botched C99 structure initialization which had somehow gone unnoticed. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/slip_proto.h')
-rw-r--r--arch/um/drivers/slip_proto.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/drivers/slip_proto.h b/arch/um/drivers/slip_proto.h
index 7206361ace45..4c4d94a33100 100644
--- a/arch/um/drivers/slip_proto.h
+++ b/arch/um/drivers/slip_proto.h
@@ -12,7 +12,8 @@
12#define SLIP_ESC_END 0334 /* ESC ESC_END means END 'data' */ 12#define SLIP_ESC_END 0334 /* ESC ESC_END means END 'data' */
13#define SLIP_ESC_ESC 0335 /* ESC ESC_ESC means ESC 'data' */ 13#define SLIP_ESC_ESC 0335 /* ESC ESC_ESC means ESC 'data' */
14 14
15static inline int slip_unesc(unsigned char c,char *buf,int *pos, int *esc) 15static inline int slip_unesc(unsigned char c, unsigned char *buf, int *pos,
16 int *esc)
16{ 17{
17 int ret; 18 int ret;
18 19