patch 7.4.1312

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

src/version.c

@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1312,
 /**/
     1311,
 /**/

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