Mercurial > vim

changeset 8033:a1b10634a28a v7.4.1311

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/d090d7bab5a0d96559579e078dfdcc6d7d4f4713 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 13 17:09:53 2016 +0100 patch 7.4.1311 Problem: sock_T is defined too late. Solution: Move it up.
author Christian Brabandt <cb@256bit.org>
date Sat, 13 Feb 2016 17:15:06 +0100
parents d23f68fc56df
children 7bcbd00d2c46
files src/version.c src/vim.h
diffstat 2 files changed, 10 insertions(+), 8 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 */
 /**/
+    1311,
+/**/
     1310,
 /**/
     1309,
--- a/src/vim.h
+++ b/src/vim.h
@@ -1730,6 +1730,14 @@ typedef struct timeval proftime_T;
 typedef int proftime_T;	    /* dummy for function prototypes */
 #endif
 
+#ifdef FEAT_CHANNEL
+# ifdef WIN64
+typedef __int64 sock_T;
+# else
+typedef int sock_T;
+# endif
+#endif
+
 /* Include option.h before structs.h, because the number of window-local and
  * buffer-local options is used there. */
 #include "option.h"	    /* options and default values */
@@ -1970,14 +1978,6 @@ typedef int VimClipboard;	/* This is req
 # define stat(a,b) (access(a,0) ? -1 : stat(a,b))
 #endif
 
-#ifdef FEAT_CHANNEL
-# ifdef WIN64
-typedef __int64 sock_T;
-# else
-typedef int sock_T;
-# endif
-#endif
-
 #include "ex_cmds.h"	    /* Ex command defines */
 #include "proto.h"	    /* function prototypes */