diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-16 19:30:55 +1000 |
|---|---|---|
| committer | Nikunj A Dadhania <nikunj@linux.vnet.ibm.com> | 2014-10-29 16:17:28 +0530 |
| commit | 1e732c553fe0a07515eec7278a715356da0bacfa (patch) | |
| tree | 15dd06f60afb315055ffb8ee9872ca085850015b /clients/net-snk/oflib/of.c | |
| parent | 8e6f2bba50c0a443dae592784cd6e12d106348bb (diff) | |
| download | SLOF-1e732c553fe0a07515eec7278a715356da0bacfa.zip SLOF-1e732c553fe0a07515eec7278a715356da0bacfa.tar.gz SLOF-1e732c553fe0a07515eec7278a715356da0bacfa.tar.bz2 | |
net-snk: Avoid type clash for stdin & stdout
Now that we are using the libc stdio
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'clients/net-snk/oflib/of.c')
| -rw-r--r-- | clients/net-snk/oflib/of.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/clients/net-snk/oflib/of.c b/clients/net-snk/oflib/of.c index 2e85e34..5c502ac 100644 --- a/clients/net-snk/oflib/of.c +++ b/clients/net-snk/oflib/of.c @@ -686,7 +686,7 @@ int of_glue_init(unsigned int * timebase, size_t _client_start, size_t _client_size) { phandle_t chosen = of_finddevice("/chosen"); - ihandle_t stdin, stdout; + ihandle_t stdin_ih, stdout_ih; client_start = (void *) (long) _client_start; client_size = _client_size; @@ -694,10 +694,11 @@ int of_glue_init(unsigned int * timebase, if (chosen == -1) return -1; - of_getprop(chosen, "stdin", &stdin, sizeof(ihandle_t)); - of_getprop(chosen, "stdout", &stdout, sizeof(ihandle_t)); - pre_open_ih(0, stdin); - pre_open_ih(1, stdout); + of_getprop(chosen, "stdin", &stdin_ih, sizeof(ihandle_t)); + of_getprop(chosen, "stdout", &stdout_ih, sizeof(ihandle_t)); + pre_open_ih(0, stdin_ih); + pre_open_ih(1, stdout_ih); + pre_open_ih(2, stdout_ih); get_timebase(timebase); rtas_init(); |