Re: [Qemu-devel] [PATCH 1/2] slirp: clean up conflicts with system headers

2012-03-23 Thread Jan Kiszka
On 2012-03-22 20:24, Paolo Bonzini wrote: > Il 22/03/2012 15:35, Jan Kiszka ha scritto: >>> @@ -167,9 +164,6 @@ int inet_aton(const char *cp, struct in_addr *ia); >>> #include "bootp.h" >>> #include "tftp.h" >>> >>> -/* osdep.c */ >>> -int qemu_socket(int domain, int type, int protocol); >>> -

Re: [Qemu-devel] [PATCH 1/2] slirp: clean up conflicts with system headers

2012-03-22 Thread Paolo Bonzini
Il 22/03/2012 15:35, Jan Kiszka ha scritto: >> @@ -167,9 +164,6 @@ int inet_aton(const char *cp, struct in_addr *ia); >> #include "bootp.h" >> #include "tftp.h" >> >> -/* osdep.c */ >> -int qemu_socket(int domain, int type, int protocol); >> - >> #define ETH_ALEN 6 >> #define ETH_HLEN 14 >>

Re: [Qemu-devel] [PATCH 1/2] slirp: clean up conflicts with system headers

2012-03-22 Thread Jan Kiszka
On 2012-03-22 01:02, Paolo Bonzini wrote: > Right now, slirp/slirp.h cannot include some system headers and, > indirectly, qemu_socket.h. Clean this up, and remove a duplicate > prototype that was introduced because of that. > > > Signed-off-by: Paolo Bonzini > --- > slirp/slirp.h |8 +

[Qemu-devel] [PATCH 1/2] slirp: clean up conflicts with system headers

2012-03-21 Thread Paolo Bonzini
Right now, slirp/slirp.h cannot include some system headers and, indirectly, qemu_socket.h. Clean this up, and remove a duplicate prototype that was introduced because of that. Signed-off-by: Paolo Bonzini --- slirp/slirp.h |8 +--- slirp/tcp.h | 21 +++-- 2 files c