patch 7.4.1312

Problem:    sock_T is not defined without the +channel feature.
Solution:   Always define it.

diff --git a/src/version.c b/src/version.c
index 130bbde6ddf95ad655109c9dabf3d54a4edbceed..b934ea284e665649ce95490ee89a7ee0a2afb3a9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1312,
 /**/
     1311,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 7f7260412a0ca588c4783435a8cdf62d1bd1babc..0297cfd682955ba4c602ac86d8e1189d0444b6ef 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1730,12 +1730,10 @@ typedef struct timeval proftime_T;
 typedef int proftime_T;            /* dummy for function prototypes */
 #endif
 
-#ifdef FEAT_CHANNEL
-# ifdef WIN64
+#ifdef WIN64
 typedef __int64 sock_T;
-# else
+#else
 typedef int sock_T;
-# endif
 #endif
 
 /* Include option.h before structs.h, because the number of window-local and