diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-13 17:09:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-13 17:09:53 +0100 |
| commit | d090d7bab5a0d96559579e078dfdcc6d7d4f4713 (patch) | |
| tree | 642257d8a3cc82dc5532af6d637115ca608e65c3 | |
| parent | 6463ca229cb9412581419497924c85fcbfc854ab (diff) | |
| download | vim-d090d7bab5a0d96559579e078dfdcc6d7d4f4713.zip | |
patch 7.4.1311
Problem: sock_T is defined too late.
Solution: Move it up.
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim.h | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/version.c b/src/version.c index 9cd54a3f1..130bbde6d 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 */ /**/ + 1311, +/**/ 1310, /**/ 1309, @@ -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 */ |