From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IQiVw-0003Kd-Ju
	for qemu-devel@nongnu.org; Thu, 30 Aug 2007 07:48:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IQiVu-0003J1-NZ
	for qemu-devel@nongnu.org; Thu, 30 Aug 2007 07:48:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IQiVu-0003Iq-Dp
	for qemu-devel@nongnu.org; Thu, 30 Aug 2007 07:48:42 -0400
Received: from dionis.simtreas.ru ([81.176.134.9])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <dzo@simtreas.ru>) id 1IQiVs-0007jZ-G3
	for qemu-devel@nongnu.org; Thu, 30 Aug 2007 07:48:42 -0400
Received: from [10.68.0.2] (dzo.ufk68.roskazna.local [10.68.0.2])
	by dionis.simtreas.ru (8.12.11/8.12.11) with ESMTP id l7UBmHh6023139
	for <qemu-devel@nongnu.org>; Thu, 30 Aug 2007 15:48:18 +0400
Message-ID: <46D6AF04.8060802@simtreas.ru>
Date: Thu, 30 Aug 2007 15:50:28 +0400
From: "Vladimir N. Oleynik" <dzo@simtreas.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------050508070803010806020801"
Subject: [Qemu-devel] No slirp usage
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

This is a multi-part message in MIME format.
--------------050508070803010806020801
Content-Type: text/plain; charset=KOI8-R; format=flowed
Content-Transfer-Encoding: 7bit

Hi.
If I compiling without SLIRP then compiler produced warnings:

vl.c: In function `parse_host_port':
vl.c: warning: implicit declaration of function `inet_aton'
vl.c: In function `net_socket_mcast_create':
vl.c: warning: implicit declaration of function `inet_ntoa'

Patch attached.
comment: removed lines from libslirp.h duplicated from slirp.h.


PS: if you interested new my nosdl.c hack, this updated
for fresh qemu-devel ftp://ftp.simtreas.ru/pub/my/qemu/nosdl.c.gz


--w
vodz

--------------050508070803010806020801
Content-Type: text/plain;
 name="no_slirp.path"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="no_slirp.path"

diff -rbu qemu.orig/slirp/libslirp.h qemu/slirp/libslirp.h
--- qemu.orig/slirp/libslirp.h	2006-05-01 01:34:14.000000000 +0400
+++ qemu/slirp/libslirp.h	2007-08-30 15:20:06.000000000 +0400
@@ -1,14 +1,6 @@
 #ifndef _LIBSLIRP_H
 #define _LIBSLIRP_H
 
-#ifdef _WIN32
-#include <winsock2.h>
-int inet_aton(const char *cp, struct in_addr *ia);
-#else
-#include <sys/select.h>
-#include <arpa/inet.h>
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff -rbu qemu.orig/vl.c qemu/vl.c
--- qemu.orig/vl.c	2007-08-30 15:17:38.000000000 +0400
+++ qemu/vl.c	2007-08-30 15:24:46.000000000 +0400
@@ -42,6 +42,8 @@
 #include <netinet/in.h>
 #include <dirent.h>
 #include <netdb.h>
+#include <sys/select.h>
+#include <arpa/inet.h>
 #ifdef _BSD
 #include <sys/stat.h>
 #ifndef __APPLE__
@@ -63,7 +65,6 @@
 #include <sys/stat.h>
 #include <sys/ethernet.h>
 #include <sys/sockio.h>
-#include <arpa/inet.h>
 #include <netinet/arp.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -76,6 +77,9 @@
 #include <stropts.h>
 #endif
 #endif
+#else
+#include <winsock2.h>
+int inet_aton(const char *cp, struct in_addr *ia);
 #endif
 
 #if defined(CONFIG_SLIRP)

--------------050508070803010806020801--