Skip to content

Commit d090d7b

Browse files
committed
patch 7.4.1311
Problem: sock_T is defined too late. Solution: Move it up.
1 parent 6463ca2 commit d090d7b

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -747,6 +747,8 @@ static char *(features[]) =
747747

748748
static int included_patches[] =
749749
{ /* Add new patch number below this line */
750+
/**/
751+
1311,
750752
/**/
751753
1310,
752754
/**/

src/vim.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,6 +1730,14 @@ typedef struct timeval proftime_T;
17301730
typedef int proftime_T; /* dummy for function prototypes */
17311731
#endif
17321732

1733+
#ifdef FEAT_CHANNEL
1734+
# ifdef WIN64
1735+
typedef __int64 sock_T;
1736+
# else
1737+
typedef int sock_T;
1738+
# endif
1739+
#endif
1740+
17331741
/* Include option.h before structs.h, because the number of window-local and
17341742
* buffer-local options is used there. */
17351743
#include "option.h" /* options and default values */
@@ -1970,14 +1978,6 @@ typedef int VimClipboard; /* This is required for the prototypes. */
19701978
# define stat(a,b) (access(a,0) ? -1 : stat(a,b))
19711979
#endif
19721980

1973-
#ifdef FEAT_CHANNEL
1974-
# ifdef WIN64
1975-
typedef __int64 sock_T;
1976-
# else
1977-
typedef int sock_T;
1978-
# endif
1979-
#endif
1980-
19811981
#include "ex_cmds.h" /* Ex command defines */
19821982
#include "proto.h" /* function prototypes */
19831983

0 commit comments

Comments
 (0)