[Qemu-devel] Re: [PATCH 04/11] Move generic or OS function declarations to qemu-common.h

[Stefan Weil <weil@mail.berlios.de>]

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.