# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455381004 -3600
# Node ID f48041801aac444ec6dcc18701b8e0b0c6ddcbae
# Parent  7bcbd00d2c467c6335c9882deb3ab373ed58ec7a
commit https://github.com/vim/vim/commit/f8b7d890f1d62f3ab101d2b02dd7716cb7f053cb
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 13 17:24:26 2016 +0100

    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
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1312,
+/**/
     1311,
 /**/
     1310,
diff --git a/src/vim.h b/src/vim.h
--- 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