xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-07 20:57:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-char: fix win32 build

Browse Source 
96c6384776d631839a9c8fe02bf135f9ba22586c 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>
This commit is contained in:
Blue Swirl 2013-03-09 09:56:04 +00:00 committed by Anthony Liguori
parent 7830cf78ac
commit 44ab9ed4f8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu-char.c
View File

@ -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,
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)
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)
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;