Commit 7c829863fb83e39a77859cfc263441670d9f058a
1 parent
33189d31
Fix slirp compilation failure when using a newer gcc
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3505 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
6 additions
and
1 deletions
slirp/misc.h
| @@ -63,7 +63,9 @@ struct emu_t { | @@ -63,7 +63,9 @@ struct emu_t { | ||
| 63 | struct emu_t *next; | 63 | struct emu_t *next; |
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | +#ifndef CONFIG_QEMU | ||
| 66 | extern struct emu_t *tcpemu; | 67 | extern struct emu_t *tcpemu; |
| 68 | +#endif | ||
| 67 | 69 | ||
| 68 | extern int x_port, x_server, x_display; | 70 | extern int x_port, x_server, x_display; |
| 69 | 71 |
slirp/tcp_subr.c
| @@ -559,7 +559,10 @@ static const struct tos_t tcptos[] = { | @@ -559,7 +559,10 @@ static const struct tos_t tcptos[] = { | ||
| 559 | {0, 0, 0, 0} | 559 | {0, 0, 0, 0} |
| 560 | }; | 560 | }; |
| 561 | 561 | ||
| 562 | -static struct emu_t *tcpemu = 0; | 562 | +#ifdef CONFIG_QEMU |
| 563 | +static | ||
| 564 | +#endif | ||
| 565 | +struct emu_t *tcpemu = 0; | ||
| 563 | 566 | ||
| 564 | /* | 567 | /* |
| 565 | * Return TOS according to the above table | 568 | * Return TOS according to the above table |