[Qemu-devel] Re: [5140] hw/pcnet.c: windows compile fix

[Jan Kiszka]

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