changeset 8035:f48041801aac v7.4.1312

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.
author Christian Brabandt <cb@256bit.org>
date Sat, 13 Feb 2016 17:30:04 +0100
parents 7bcbd00d2c46
children 72d658f0f095
files src/version.c src/vim.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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