[Xen-changelog] [xen-unstable] ioemu: some ifndef NO_UNIX_SOCKETS were missing

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1202724199 0
# Node ID b0119e24d900de9b1e65c508d2dddcc31d1c9627
# Parent  dbb60ed6bc22ea17d34d18ae4a769b917acd5ef4
ioemu: some ifndef NO_UNIX_SOCKETS were missing
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
---
 tools/ioemu/vl.c  |   14 +++++++-------
 tools/ioemu/vnc.c |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff -r dbb60ed6bc22 -r b0119e24d900 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c  Mon Feb 11 10:03:05 2008 +0000
+++ b/tools/ioemu/vl.c  Mon Feb 11 10:03:19 2008 +0000
@@ -2532,7 +2532,7 @@ static void udp_chr_update_read_handler(
 }
 
 int parse_host_port(struct sockaddr_in *saddr, const char *str);
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
 static int parse_unix_path(struct sockaddr_un *uaddr, const char *str);
 #endif
 int parse_host_src_port(struct sockaddr_in *haddr,
@@ -2740,7 +2740,7 @@ static void tcp_chr_accept(void *opaque)
     CharDriverState *chr = opaque;
     TCPCharDriver *s = chr->opaque;
     struct sockaddr_in saddr;
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
     struct sockaddr_un uaddr;
 #endif
     struct sockaddr *addr;
@@ -2748,7 +2748,7 @@ static void tcp_chr_accept(void *opaque)
     int fd;
 
     for(;;) {
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
        if (s->is_unix) {
            len = sizeof(uaddr);
            addr = (struct sockaddr *)&uaddr;
@@ -2797,13 +2797,13 @@ static CharDriverState *qemu_chr_open_tc
     int do_nodelay = 0;
     const char *ptr;
     struct sockaddr_in saddr;
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
     struct sockaddr_un uaddr;
 #endif
     struct sockaddr *addr;
     socklen_t addrlen;
 
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
     if (is_unix) {
        addr = (struct sockaddr *)&uaddr;
        addrlen = sizeof(uaddr);
@@ -2842,7 +2842,7 @@ static CharDriverState *qemu_chr_open_tc
     if (!s)
         goto fail;
 
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
     if (is_unix)
        fd = socket(PF_UNIX, SOCK_STREAM, 0);
     else
@@ -2867,7 +2867,7 @@ static CharDriverState *qemu_chr_open_tc
 
     if (is_listen) {
         /* allow fast reuse */
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
        if (is_unix) {
            char path[109];
            strncpy(path, uaddr.sun_path, 108);
diff -r dbb60ed6bc22 -r b0119e24d900 tools/ioemu/vnc.c
--- a/tools/ioemu/vnc.c Mon Feb 11 10:03:05 2008 +0000
+++ b/tools/ioemu/vnc.c Mon Feb 11 10:03:19 2008 +0000
@@ -2297,7 +2297,7 @@ int vnc_display_open(DisplayState *ds, c
 {
     struct sockaddr *addr;
     struct sockaddr_in iaddr;
-#ifndef _WIN32
+#ifndef NO_UNIX_SOCKETS
     struct sockaddr_un uaddr;
 #endif
     int reuse_addr, ret;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog