From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KaqLt-0002Pq-Le
	for qemu-devel@nongnu.org; Wed, 03 Sep 2008 07:16:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KaqLs-0002PE-AZ
	for qemu-devel@nongnu.org; Wed, 03 Sep 2008 07:16:44 -0400
Received: from [199.232.76.173] (port=50168 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KaqLq-0002Om-RC
	for qemu-devel@nongnu.org; Wed, 03 Sep 2008 07:16:43 -0400
Received: from gecko.sbs.de ([194.138.37.40]:16072)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <jan.kiszka@siemens.com>) id 1KaqLq-0006IL-O8
	for qemu-devel@nongnu.org; Wed, 03 Sep 2008 07:16:43 -0400
Message-ID: <48BE7206.4090402@siemens.com>
Date: Wed, 03 Sep 2008 13:16:22 +0200
From: Jan Kiszka <jan.kiszka@siemens.com>
MIME-Version: 1.0
References: <E1KafGI-0000Ic-1p@cvs.savannah.gnu.org>
	<alpine.DEB.1.00.0809031217530.13830@pacific.mpi-cbg.de.mpi-cbg.de>
In-Reply-To: <alpine.DEB.1.00.0809031217530.13830@pacific.mpi-cbg.de.mpi-cbg.de>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [5140] hw/pcnet.c: windows compile fix
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
Cc: Aurelien Jarno <aurelien@aurel32.net>

Johannes Schindelin wrote:
> Hi,
> 
> On Tue, 2 Sep 2008, Aurelien Jarno wrote:
> 
>> Log Message:
>> -----------
>> hw/pcnet.c: windows compile fix
>>
>> (Eduardo Felipe)
>>
>> Modified Paths:
>> --------------
>>     trunk/hw/pcnet.c
>>
>> Modified: trunk/hw/pcnet.c
>> ===================================================================
>> --- trunk/hw/pcnet.c	2008-09-02 17:39:45 UTC (rev 5139)
>> +++ trunk/hw/pcnet.c	2008-09-02 23:26:13 UTC (rev 5140)
>> @@ -35,7 +35,11 @@
>>   * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
>>   */
>>  
>> +#ifdef _WIN32
>> +#include <winsock2.h>
>> +#else
>>  #include <netinet/in.h>
>> +#endif
> 
> Was the idea not to use the header file "qemu_socket.h" instead?

Sounds reasonable to me.

Jan

Index: qemu/hw/pcnet.c
===================================================================
--- qemu/hw/pcnet.c	(Revision 5144)
+++ qemu/hw/pcnet.c	(Arbeitskopie)
@@ -35,16 +35,11 @@
  * http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR92C990.txt
  */
 
-#ifdef _WIN32
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-
 #include "hw.h"
 #include "pci.h"
 #include "net.h"
 #include "qemu-timer.h"
+#include "qemu_socket.h"
 
 //#define PCNET_DEBUG
 //#define PCNET_DEBUG_IO