aboutsummaryrefslogtreecommitdiff
path: root/slirp
diff options
context:
space:
mode:
authorblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-01 19:23:51 +0000
committerblueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-01 19:23:51 +0000
commit7c829863fb83e39a77859cfc263441670d9f058a (patch)
tree98537a1a138c2b9209bff48b3eb5c220ca98a206 /slirp
parent33189d31154c1738f0897a8f3475f1ecdaca9c78 (diff)
downloadqemu-7c829863fb83e39a77859cfc263441670d9f058a.zip
qemu-7c829863fb83e39a77859cfc263441670d9f058a.tar.gz
qemu-7c829863fb83e39a77859cfc263441670d9f058a.tar.bz2
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.h2
-rw-r--r--slirp/tcp_subr.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/slirp/misc.h b/slirp/misc.h
index eee7405..e405e38 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 7d71270..ba1296d 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