Patchwork [2/2] qemu-char: fix win32 build

login
register
mail settings
Submitter Blue Swirl
Date March 9, 2013, 9:56 a.m.
Message ID <0ba5565b1ed44380c57d4a5fab86e9549f581ebf.1362822910.git.blauwirbel@gmail.com>
Download mbox | patch
Permalink /patch/226324/
State New
Headers show

Comments

Blue Swirl - March 9, 2013, 9:56 a.m.
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(-)
Igor Mitsyanko - March 10, 2013, 1:50 p.m.
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>

Patch

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;