* [Qemu-devel] [5140] hw/pcnet.c: windows compile fix
@ 2008-09-02 23:26 Aurelien Jarno
2008-09-03 10:19 ` Johannes Schindelin
0 siblings, 1 reply; 4+ messages in thread
From: Aurelien Jarno @ 2008-09-02 23:26 UTC (permalink / raw)
To: qemu-devel
Revision: 5140
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5140
Author: aurel32
Date: 2008-09-02 23:26:13 +0000 (Tue, 02 Sep 2008)
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
#include "hw.h"
#include "pci.h"
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [5140] hw/pcnet.c: windows compile fix
2008-09-02 23:26 [Qemu-devel] [5140] hw/pcnet.c: windows compile fix Aurelien Jarno
@ 2008-09-03 10:19 ` Johannes Schindelin
2008-09-03 11:16 ` [Qemu-devel] " Jan Kiszka
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Schindelin @ 2008-09-03 10:19 UTC (permalink / raw)
To: Aurelien Jarno; +Cc: qemu-devel
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?
Just for future reference,
Dscho
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] Re: [5140] hw/pcnet.c: windows compile fix
2008-09-03 10:19 ` Johannes Schindelin
@ 2008-09-03 11:16 ` Jan Kiszka
2008-09-04 4:35 ` Aurelien Jarno
0 siblings, 1 reply; 4+ messages in thread
From: Jan Kiszka @ 2008-09-03 11:16 UTC (permalink / raw)
To: qemu-devel; +Cc: Aurelien Jarno
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] Re: [5140] hw/pcnet.c: windows compile fix
2008-09-03 11:16 ` [Qemu-devel] " Jan Kiszka
@ 2008-09-04 4:35 ` Aurelien Jarno
0 siblings, 0 replies; 4+ messages in thread
From: Aurelien Jarno @ 2008-09-04 4:35 UTC (permalink / raw)
To: qemu-devel
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
`. `' aurel32@debian.org | aurelien@aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-09-04 4:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-02 23:26 [Qemu-devel] [5140] hw/pcnet.c: windows compile fix Aurelien Jarno
2008-09-03 10:19 ` Johannes Schindelin
2008-09-03 11:16 ` [Qemu-devel] " Jan Kiszka
2008-09-04 4:35 ` Aurelien Jarno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).