From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:39875)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <blauwirbel@gmail.com>) id 1QApSe-0005Ds-2h
	for qemu-devel@nongnu.org; Fri, 15 Apr 2011 16:17:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <blauwirbel@gmail.com>) id 1QApSd-00050g-5z
	for qemu-devel@nongnu.org; Fri, 15 Apr 2011 16:17:48 -0400
Received: from mail-vw0-f45.google.com ([209.85.212.45]:34582)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <blauwirbel@gmail.com>) id 1QApSd-00050c-0o
	for qemu-devel@nongnu.org; Fri, 15 Apr 2011 16:17:47 -0400
Received: by vws17 with SMTP id 17so2785310vws.4
	for <qemu-devel@nongnu.org>; Fri, 15 Apr 2011 13:17:46 -0700 (PDT)
MIME-Version: 1.0
In-Reply-To: <4DA4207C.3090409@redhat.com>
References: <BANLkTimZJYBF3S+G=vNsvQ=J+UiczGxyYw@mail.gmail.com>
	<4DA4207C.3090409@redhat.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Fri, 15 Apr 2011 23:17:26 +0300
Message-ID: <BANLkTinwKdJ3v6CqUhqPSxKZW1LR_TSAmg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 04/11] Move generic or OS function
 declarations to qemu-common.h
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <http://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jes Sorensen <Jes.Sorensen@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

On Tue, Apr 12, 2011 at 12:50 PM, Jes Sorensen <Jes.Sorensen@redhat.com> wr=
ote:
> On 04/08/11 22:45, Blue Swirl wrote:
>> Move generic or OS related function declarations and macro
>> TFR to qemu-common.h.
>>
>> While moving, also add #include <winsock2.h> to fix a
>> recent mingw32 build breakage.
>>
>> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
>> ---
>> =C2=A0qemu-common.h | =C2=A0 21 +++++++++++++++++++++
>> =C2=A0sysemu.h =C2=A0 =C2=A0 =C2=A0| =C2=A0 21 ---------------------
>> =C2=A02 files changed, 21 insertions(+), 21 deletions(-)
>>
>> diff --git a/qemu-common.h b/qemu-common.h
>> index 82e27c1..8b48a09 100644
>> --- a/qemu-common.h
>> +++ b/qemu-common.h
>> @@ -12,6 +12,7 @@
>> =C2=A0#endif
>>
>> =C2=A0#define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE=
__[(x)?-1:1];
>> +#define TFR(expr) do { if ((expr) !=3D -1) break; } while (errno =3D=3D=
 EINTR)
>>
>> =C2=A0typedef struct QEMUTimer QEMUTimer;
>> =C2=A0typedef struct QEMUFile QEMUFile;
>> @@ -39,6 +40,16 @@ typedef struct Monitor Monitor;
>> =C2=A0#include <sys/time.h>
>> =C2=A0#include <assert.h>
>>
>> +#ifdef _WIN32
>> +#include <windows.h>
>> +#include <winsock2.h>
>> +#include "qemu-os-win32.h"
>> +#endif
>> +
>> +#ifdef CONFIG_POSIX
>> +#include "qemu-os-posix.h"
>> +#endif
>> +
>
> Nice, the more we can get out of the dreadful sysemu.h the better.
> However, please put the includes of windows.h and winsock2.h into
> qemu-os-win32.h instead.

Thanks for the comments, applied with the includes fixed.