From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=38148 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q8Ivy-0005Bn-EA
	for qemu-devel@nongnu.org; Fri, 08 Apr 2011 17:09:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <weil@mail.berlios.de>) id 1Q8Ivx-0007ec-Mj
	for qemu-devel@nongnu.org; Fri, 08 Apr 2011 17:09:38 -0400
Received: from moutng.kundenserver.de ([212.227.126.186]:63556)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <weil@mail.berlios.de>) id 1Q8Ivx-0007eH-9U
	for qemu-devel@nongnu.org; Fri, 08 Apr 2011 17:09:37 -0400
Message-ID: <4D9F798C.3060206@mail.berlios.de>
Date: Fri, 08 Apr 2011 23:09:32 +0200
From: Stefan Weil <weil@mail.berlios.de>
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; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [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/listinfo/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>

Am 08.04.2011 22:45, schrieb Blue Swirl:
> 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
> +

As far as I could see, there is no file which includes qemu-os-win32.h
without including qemu-common.h.

So it is possible to move windows.h and winsock2.h to qemu-os-win32.h
This would reduce complexity of the common header qemu-common.h a little.