diff options
| author |   blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-01 19:23:51 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-01 19:23:51 +0000 |
| commit | 7c829863fb83e39a77859cfc263441670d9f058a (patch) | |
| tree | 98537a1a138c2b9209bff48b3eb5c220ca98a206 /slirp | |
| parent | Add new files fir strace support, missed in earlier commit. (diff) | |
| download | qemu-kvm-7c829863fb83e39a77859cfc263441670d9f058a.tar.gz qemu-kvm-7c829863fb83e39a77859cfc263441670d9f058a.tar.bz2 qemu-kvm-7c829863fb83e39a77859cfc263441670d9f058a.zip | |
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
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/misc.h | 2 | ||||
| -rw-r--r-- | slirp/tcp_subr.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/slirp/misc.h b/slirp/misc.h index eee740575..e405e38dc 100644 --- a/slirp/misc.h +++ b/slirp/misc.h @@ -63,7 +63,9 @@ struct emu_t { struct emu_t *next; }; +#ifndef CONFIG_QEMU extern struct emu_t *tcpemu; +#endif extern int x_port, x_server, x_display; diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 7d7127054..ba1296d4b 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -559,7 +559,10 @@ static const struct tos_t tcptos[] = { {0, 0, 0, 0} }; -static struct emu_t *tcpemu = 0; +#ifdef CONFIG_QEMU +static +#endif +struct emu_t *tcpemu = 0; /* * Return TOS according to the above table |