From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42177 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q8I98-0008BZ-T6 for qemu-devel@nongnu.org; Fri, 08 Apr 2011 16:19:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q8I97-00086O-KC for qemu-devel@nongnu.org; Fri, 08 Apr 2011 16:19:10 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:48692) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q8I97-00086H-FW for qemu-devel@nongnu.org; Fri, 08 Apr 2011 16:19:09 -0400 Received: by vxb41 with SMTP id 41so3404567vxb.4 for ; Fri, 08 Apr 2011 13:19:09 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <4D9F66DA.9000309@mail.berlios.de> References: <1301605129-12808-1-git-send-email-weil@mail.berlios.de> <4D9F66DA.9000309@mail.berlios.de> From: Blue Swirl Date: Fri, 8 Apr 2011 23:18:48 +0300 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] Re: [PATCH] w32: Fix compilation of new code List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Paolo Bonzini , Anthony Liguori , QEMU Developers On Fri, Apr 8, 2011 at 10:49 PM, Stefan Weil wrote: > Am 03.04.2011 11:10, schrieb Blue Swirl: >> >> On Thu, Mar 31, 2011 at 11:58 PM, Stefan Weil >> wrote: >>> >>> Some recently added new code did not compile for w32 targets. >>> >>> The functions qemu_iohandler_fill and qemu_iohandler_poll need >>> data type fd_set which is declared in winsock2.h for w32 targets. >>> >>> Moving the functions from qemu-common.h to qemu_socket.h fixes >>> compilations for w32 without adding a new include file to qemu-common.h. >> >> There's nothing socket specific in qemu_iohandler_fill and >> qemu_iohandler_poll, so I'd rather fix qemu-common.h. But I have a >> patch in my working queue to move OS specific stuff to qemu-common.h, >> I'll fix this there. > > > Should I send a patch for qemu-common.h? This would need inclusion > of winsock2.h for windows and fixing a conflict with json-lexer.c > (which uses an enum value named ERROR)? I have a fix for that also in my tree. I'll send a new set of patches, the first trivial ones should be OK to commit.