patch 7.4.1311

Problem:    sock_T is defined too late.
Solution:   Move it up.

diff --git a/src/version.c b/src/version.c
index 9cd54a3f1e38b286d924667af32997fc1808f2f2..130bbde6ddf95ad655109c9dabf3d54a4edbceed 100644 (file)
--- 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 */
+/**/
+    1311,
 /**/
     1310,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 17034ef942a4691d8c9441bed30c30ca54108b8d..7f7260412a0ca588c4783435a8cdf62d1bd1babc 100644 (file)
--- 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 required for the prototypes. */
 # 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 */