summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/version.c2
-rw-r--r--src/vim.h6
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
@@ -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
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