From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:42783)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Jes.Sorensen@redhat.com>) id 1Q9aFr-00007m-2V
	for qemu-devel@nongnu.org; Tue, 12 Apr 2011 05:51:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Jes.Sorensen@redhat.com>) id 1Q9aFq-0008WN-04
	for qemu-devel@nongnu.org; Tue, 12 Apr 2011 05:51:27 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42401)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Jes.Sorensen@redhat.com>) id 1Q9aFp-0008WA-Ny
	for qemu-devel@nongnu.org; Tue, 12 Apr 2011 05:51:25 -0400
Message-ID: <4DA4207C.3090409@redhat.com>
Date: Tue, 12 Apr 2011 11:50:52 +0200
From: Jes Sorensen <Jes.Sorensen@redhat.com>
MIME-Version: 1.0
References: <BANLkTimZJYBF3S+G=vNsvQ=J+UiczGxyYw@mail.gmail.com>
In-Reply-To: <BANLkTimZJYBF3S+G=vNsvQ=J+UiczGxyYw@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
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: Blue Swirl <blauwirbel@gmail.com>
Cc: qemu-devel <qemu-devel@nongnu.org>

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>
> ---
>  qemu-common.h |   21 +++++++++++++++++++++
>  sysemu.h      |   21 ---------------------
>  2 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 @@
>  #endif
> 
>  #define QEMU_BUILD_BUG_ON(x) typedef char __build_bug_on__##__LINE__[(x)?-1:1];
> +#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
> 
>  typedef struct QEMUTimer QEMUTimer;
>  typedef struct QEMUFile QEMUFile;
> @@ -39,6 +40,16 @@ typedef struct Monitor Monitor;
>  #include <sys/time.h>
>  #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.

Cheers,
Jes