patch 7.4.1169
Problem: The socket I/O is intertwined with the netbeans code.
Solution: Start refactoring the netbeans communication to split off the
socket I/O. Add the +channel feature.
diff --git a/src/gui_w32.c b/src/gui_w32.c
index db0a9d5..ecc1fab 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -553,7 +553,7 @@
static TMonitorFromWindow pMonitorFromWindow = NULL;
static TGetMonitorInfo pGetMonitorInfo = NULL;
static HANDLE user32_lib = NULL;
-#ifdef FEAT_NETBEANS_INTG
+#ifdef FEAT_CHANNEL
int WSInitialized = FALSE; /* WinSock is initialized */
#endif
/*
@@ -5048,12 +5048,14 @@
SetPixel(s_hdc, x+3, y++, gui.currFgColor);
SetPixel(s_hdc, x+2, y, gui.currFgColor);
}
+#endif
+#if defined(FEAT_CHANNEL) || defined(PROTO)
/*
* Initialize the Winsock dll.
*/
void
-netbeans_init_winsock()
+channel_init_winsock()
{
WSADATA wsaData;
int wsaerr;