aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 7.4.1311

Browse Source 
Problem:    sock_T is defined too late.
Solution:   Move it up.
This commit is contained in:
Bram Moolenaar
2016-02-13 17:09:53 +01:00
parent 6463ca229c
commit d090d7bab5
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1311,
/**/ /**/
1310, 1310,
/**/ /**/

16
src/vim.h
View File

@@ -1730,6 +1730,14 @@ typedef struct timeval proftime_T;
typedef int proftime_T; /* dummy for function prototypes */ typedef int proftime_T; /* dummy for function prototypes */
#endif #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 /* Include option.h before structs.h, because the number of window-local and
* buffer-local options is used there. */ * buffer-local options is used there. */
#include "option.h" /* options and default values */ #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)) # define stat(a,b) (access(a,0) ? -1 : stat(a,b))
#endif #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 "ex_cmds.h" /* Ex command defines */
#include "proto.h" /* function prototypes */ #include "proto.h" /* function prototypes */