summaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux
diff options
context:
space:
mode:
authorHans-Werner Hilse <hwhilse@gmail.com>2015-06-11 11:29:19 +0200
committerRichard Weinberger <richard@nod.at>2015-06-25 22:42:19 +0200
commitf9bb3b5947c507d402eecbffabb8fb0864263ad1 (patch)
tree82e1167c87b395d3bcb2ef3cd1e73236d1cf9527 /arch/um/os-Linux
parent9a75551aeaa8c79fd6ad713cb20e6bbccc767331 (diff)
downloadlinux-f9bb3b5947c507d402eecbffabb8fb0864263ad1.tar.gz
linux-f9bb3b5947c507d402eecbffabb8fb0864263ad1.tar.bz2
linux-f9bb3b5947c507d402eecbffabb8fb0864263ad1.zip
um: Do not use stdin and stdout identifiers for struct members
stdin, stdout and stderr are macros according to C89/C99. Thus do not use them as struct member identifiers to avoid bad results from macro expansion. Signed-off-by: Hans-Werner Hilse <hwhilse@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/os-Linux')
-rw-r--r--arch/um/os-Linux/drivers/tuntap_user.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
index 14126d9176aa..c2e6e1dad876 100644
--- a/arch/um/os-Linux/drivers/tuntap_user.c
+++ b/arch/um/os-Linux/drivers/tuntap_user.c
@@ -47,7 +47,7 @@ static void tuntap_del_addr(unsigned char *addr, unsigned char *netmask,
}
struct tuntap_pre_exec_data {
- int stdout;
+ int stdout_fd;
int close_me;
};
@@ -55,7 +55,7 @@ static void tuntap_pre_exec(void *arg)
{
struct tuntap_pre_exec_data *data = arg;
- dup2(data->stdout, 1);
+ dup2(data->stdout_fd, 1);
close(data->close_me);
}
@@ -74,7 +74,7 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
sprintf(version_buf, "%d", UML_NET_VERSION);
- data.stdout = remote;
+ data.stdout_fd = remote;
data.close_me = me;
pid = run_helper(tuntap_pre_exec, &data, argv);