aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/slirp.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/slirp.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/slirp.h')
-rw-r--r--arch/um/drivers/slirp.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/slirp.h b/arch/um/drivers/slirp.h
index 04e407d1e44a..afa4e30284fd 100644
--- a/arch/um/drivers/slirp.h
+++ b/arch/um/drivers/slirp.h
@@ -24,8 +24,8 @@ struct slirp_data {
24 struct arg_list_dummy_wrapper argw; 24 struct arg_list_dummy_wrapper argw;
25 int pid; 25 int pid;
26 int slave; 26 int slave;
27 char ibuf[ENC_BUF_SIZE]; 27 unsigned char ibuf[ENC_BUF_SIZE];
28 char obuf[ENC_BUF_SIZE]; 28 unsigned char obuf[ENC_BUF_SIZE];
29 int more; /* more data: do not read fd until ibuf has been drained */ 29 int more; /* more data: do not read fd until ibuf has been drained */
30 int pos; 30 int pos;
31 int esc; 31 int esc;