Commit 44ab9ed4 authored by Blue Swirl's avatar Blue Swirl Committed by Anthony Liguori
Browse files

qemu-char: fix win32 build

96c63847

 did not adjust
Win32 #ifdeffery properly, breaking build in later commits. Fix.
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
Tested-by: default avatarIgor Mitsyanko <i.mitsyanko@gmail.com>
Message-id: 0ba5565b1ed44380c57d4a5fab86e9549f581ebf.1362822910.git.blauwirbel@gmail.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 7830cf78
...@@ -535,8 +535,6 @@ int send_all(int fd, const void *_buf, int len1) ...@@ -535,8 +535,6 @@ int send_all(int fd, const void *_buf, int len1)
} }
#endif /* !_WIN32 */ #endif /* !_WIN32 */
#ifndef _WIN32
typedef struct IOWatchPoll typedef struct IOWatchPoll
{ {
GSource *src; GSource *src;
...@@ -634,6 +632,7 @@ static guint io_add_watch_poll(GIOChannel *channel, ...@@ -634,6 +632,7 @@ static guint io_add_watch_poll(GIOChannel *channel,
return tag; return tag;
} }
#ifndef _WIN32
static GIOChannel *io_channel_from_fd(int fd) static GIOChannel *io_channel_from_fd(int fd)
{ {
GIOChannel *chan; GIOChannel *chan;
...@@ -649,6 +648,7 @@ static GIOChannel *io_channel_from_fd(int fd) ...@@ -649,6 +648,7 @@ static GIOChannel *io_channel_from_fd(int fd)
return chan; return chan;
} }
#endif
static GIOChannel *io_channel_from_socket(int fd) 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) ...@@ -699,6 +699,8 @@ static int io_channel_send_all(GIOChannel *fd, const void *_buf, int len1)
return len1 - len; return len1 - len;
} }
#ifndef _WIN32
typedef struct FDCharDriver { typedef struct FDCharDriver {
CharDriverState *chr; CharDriverState *chr;
GIOChannel *fd_in, *fd_out; GIOChannel *fd_in, *fd_out;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment