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

diff --git a/slirp/misc.h b/slirp/misc.h
index eee7405750036449875a1fcf79524b83c7f1adcf..e405e38dc09b652c163ffcf9cd11d6dab1638fa9 100644 (file)
--- 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 7d71270542970d587fe72fe9172b0c9629468112..ba1296d4bb13892c4d5fd9c024b153ccaa5bf8e9 100644 (file)
--- 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