]> git.proxmox.com Git - qemu.git/commit
slirp: clean up conflicts with system headers
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 22 Mar 2012 00:02:51 +0000 (01:02 +0100)
committerJan Kiszka <jan.kiszka@siemens.com>
Wed, 28 Mar 2012 18:33:16 +0000 (20:33 +0200)
commitb72210568ef0c0fb141a01cffb71a09c4efa0364
treef2f41b628a5e8239b29a900c0888d4b73e9dd476
parent1658dd32408c75e850b55ab0ff70d5cc402674d5
slirp: clean up conflicts with system headers

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 <pbonzini@redhat.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
slirp/slirp.h
slirp/tcp.h