From 7c829863fb83e39a77859cfc263441670d9f058a Mon Sep 17 00:00:00 2001
From: blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 1 Nov 2007 19:23:51 +0000
Subject:  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
---
 slirp/misc.h     | 2 ++
 slirp/tcp_subr.c | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'slirp')

diff --git a/slirp/misc.h b/slirp/misc.h
index eee7405750..e405e38dc0 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 7d71270542..ba1296d4bb 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
-- 
cgit v1.2.3