patch 7.4.1195
Problem: The channel feature does not work in the MS-Windows console.
Solution: Add win32 console support. (Yasuhiro Matsumoto)
diff --git a/src/channel.c b/src/channel.c
index def6833..46c45b6 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -91,7 +91,7 @@
#ifdef FEAT_GUI_GTK
gint ch_inputHandler; /* Cookie for input */
#endif
-#ifdef FEAT_GUI_W32
+#ifdef WIN32
int ch_inputHandler; /* simply ret.value of WSAAsyncSelect() */
#endif
@@ -279,14 +279,14 @@
int sd;
struct sockaddr_in server;
struct hostent * host;
-#ifdef FEAT_GUI_W32
+#ifdef WIN32
u_short port = port_in;
#else
int port = port_in;
#endif
int idx;
-#ifdef FEAT_GUI_W32
+#ifdef WIN32
channel_init_winsock();
#endif
@@ -861,7 +861,7 @@
return channel_get(idx);
}
-# if defined(FEAT_GUI_W32) || defined(PROTO)
+# if defined(WIN32) || defined(PROTO)
/*
* Lookup the channel index from the socket.
* Returns -1 when the socket isn't found.
@@ -965,7 +965,7 @@
}
# endif /* UNIX && !HAVE_SELECT */
-# if (defined(UNIX) && defined(HAVE_SELECT)) || defined(PROTO)
+# if (!defined(FEAT_GUI_W32) && defined(HAVE_SELECT)) || defined(PROTO)
/*
* The type of "rfds" is hidden to avoid problems with the function proto.
*/
@@ -1007,6 +1007,6 @@
return ret;
}
-# endif /* UNIX && HAVE_SELECT */
+# endif /* !FEAT_GUI_W32 && HAVE_SELECT */
#endif /* FEAT_CHANNEL */