From f8b7d890f1d62f3ab101d2b02dd7716cb7f053cb Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 13 Feb 2016 17:24:26 +0100
Subject: [PATCH] patch 7.4.1312 Problem:    sock_T is not defined without the
 +channel feature. Solution:   Always define it.

---
 src/version.c | 2 ++
 src/vim.h     | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/version.c b/src/version.c
index 130bbde6d..b934ea284 100644
--- 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 7f7260412..0297cfd68 100644
--- 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