[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] Re: [5140] hw/pcnet.c: windows compile fix
From: |
Aurelien Jarno |
Subject: |
Re: [Qemu-devel] Re: [5140] hw/pcnet.c: windows compile fix |
Date: |
Thu, 4 Sep 2008 06:35:48 +0200 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
On Wed, Sep 03, 2008 at 01:16:22PM +0200, Jan Kiszka wrote:
> 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.
Applied, thanks.
> 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
>
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' address@hidden | address@hidden
`- people.debian.org/~aurel32 | www.aurel32.net