projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7830cf7
)
qemu-char: fix win32 build
author
Blue Swirl
<blauwirbel@gmail.com>
Sat, 9 Mar 2013 09:56:04 +0000
(09:56 +0000)
committer
Anthony Liguori
<aliguori@us.ibm.com>
Mon, 11 Mar 2013 00:26:22 +0000
(19:26 -0500)
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>
qemu-char.c
patch
|
blob
|
history
diff --git
a/qemu-char.c
b/qemu-char.c
index
b82d643
..
04aa589
100644
(file)
--- 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;