To: vim_dev@googlegroups.com Subject: Patch 7.4.1311 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1311 (after 7.4.1310) Problem: sock_T is defined too late. Solution: Move it up. Files: src/vim.h *** ../vim-7.4.1310/src/vim.h 2016-02-07 19:16:24.238303734 +0100 --- src/vim.h 2016-02-12 20:17:33.836059985 +0100 *************** *** 1730,1735 **** --- 1730,1743 ---- 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,1983 **** # 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 */ --- 1978,1983 ---- *** ../vim-7.4.1310/src/version.c 2016-02-13 17:04:08.426819018 +0100 --- src/version.c 2016-02-13 17:09:19.551585154 +0100 *************** *** 749,750 **** --- 749,752 ---- { /* Add new patch number below this line */ + /**/ + 1311, /**/ -- A man is incomplete until he's married ... and then he's finished! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///