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

qemu-char.c

+4 −2
Original line number Diff line number Diff line
@@ -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;