0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 7.4.1312

Problem:    sock_T is not defined without the +channel feature.
Solution:   Always define it.
This commit is contained in:
Bram Moolenaar
2016-02-13 17:24:26 +01:00
parent d090d7bab5
commit f8b7d890f1
2 changed files with 4 additions and 4 deletions

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 */
/**/
1312,
/**/ /**/
1311, 1311,
/**/ /**/

View File

@@ -1730,12 +1730,10 @@ 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
# ifdef WIN64
typedef __int64 sock_T; typedef __int64 sock_T;
# else #else
typedef int sock_T; typedef int sock_T;
# endif
#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