From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:58428)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <i.mitsyanko@gmail.com>) id 1UEge0-0006o4-D9
	for qemu-devel@nongnu.org; Sun, 10 Mar 2013 09:50:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <i.mitsyanko@gmail.com>) id 1UEgdw-0002HW-46
	for qemu-devel@nongnu.org; Sun, 10 Mar 2013 09:50:32 -0400
Received: from mail-lb0-f182.google.com ([209.85.217.182]:34569)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <i.mitsyanko@gmail.com>) id 1UEgdv-0002HA-SE
	for qemu-devel@nongnu.org; Sun, 10 Mar 2013 09:50:28 -0400
Received: by mail-lb0-f182.google.com with SMTP id gg6so2492005lbb.27
	for <qemu-devel@nongnu.org>; Sun, 10 Mar 2013 06:50:26 -0700 (PDT)
Message-ID: <513C8F9E.1070907@gmail.com>
Date: Sun, 10 Mar 2013 17:50:22 +0400
From: Igor Mitsyanko <i.mitsyanko@gmail.com>
MIME-Version: 1.0
References: <c50406bda98f8b277e8b9004a0012fa5e5c124d0.1362822910.git.blauwirbel@gmail.com>
	<0ba5565b1ed44380c57d4a5fab86e9549f581ebf.1362822910.git.blauwirbel@gmail.com>
In-Reply-To: <0ba5565b1ed44380c57d4a5fab86e9549f581ebf.1362822910.git.blauwirbel@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/2] qemu-char: fix win32 build
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: amit.shah@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org

On 09.03.2013 13:56, Blue Swirl wrote:
> 96c6384776d631839a9c8fe02bf135f9ba22586c did not adjust
> Win32 #ifdeffery properly, breaking build in later commits. Fix.
>
> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
> ---
>   qemu-char.c |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index b82d643..04aa589 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -535,8 +535,6 @@ int send_all(int fd, const void *_buf, int len1)
>   }
>   #endif /* !_WIN32 */
>
> -#ifndef _WIN32
> -
>   typedef struct IOWatchPoll
>   {
>       GSource *src;
> @@ -634,6 +632,7 @@ static guint io_add_watch_poll(GIOChannel *channel,
>       return tag;
>   }
>
> +#ifndef _WIN32
>   static GIOChannel *io_channel_from_fd(int fd)
>   {
>       GIOChannel *chan;
> @@ -649,6 +648,7 @@ static GIOChannel *io_channel_from_fd(int fd)
>
>       return chan;
>   }
> +#endif
>
>   static GIOChannel *io_channel_from_socket(int fd)
>   {
> @@ -699,6 +699,8 @@ static int io_channel_send_all(GIOChannel *fd, const void *_buf, int len1)
>       return len1 - len;
>   }
>
> +#ifndef _WIN32
> +
>   typedef struct FDCharDriver {
>       CharDriverState *chr;
>       GIOChannel *fd_in, *fd_out;
>

This patch fixes build for me.

Tested-by: Igor Mitsyanko <i.mitsyanko@gmail.com>