Skip to content

Commit

Permalink
qemu-char: fix win32 build
Browse files Browse the repository at this point in the history
96c6384 did not adjust
Win32 #ifdeffery properly, breaking build in later commits. Fix.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Tested-by: Igor Mitsyanko <i.mitsyanko@gmail.com>
Message-id: 0ba5565b1ed44380c57d4a5fab86e9549f581ebf.1362822910.git.blauwirbel@gmail.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information
blueswirl authored and Anthony Liguori committed Mar 11, 2013
1 parent 7830cf7 commit 44ab9ed
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions qemu-char.c
Expand Up @@ -535,8 +535,6 @@ int send_all(int fd, const void *_buf, int len1)
}
#endif /* !_WIN32 */

#ifndef _WIN32

typedef struct IOWatchPoll
{
GSource *src;
Expand Down Expand Up @@ -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;
Expand All @@ -649,6 +648,7 @@ static GIOChannel *io_channel_from_fd(int fd)

return chan;
}
#endif

static GIOChannel *io_channel_from_socket(int fd)
{
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 44ab9ed

Please sign in to comment.