# HG changeset patch # User Christian Brabandt # Date 1456590604 -3600 # Node ID fa1e3fa56104294f6b96b0105f246f457b4f350b # Parent 3a1e67a37adf24ed5f34c3a861c9f595fc3b9805 commit https://github.com/vim/vim/commit/9e24f0c5c1b1097295d0619d95da66e6b2d83ac9 Author: Bram Moolenaar Date: Sat Feb 27 17:22:27 2016 +0100 patch 7.4.1431 Problem: Including header files twice. Solution: Remove the extra includes. diff --git a/src/if_cscope.h b/src/if_cscope.h --- a/src/if_cscope.h +++ b/src/if_cscope.h @@ -11,16 +11,11 @@ #if defined(FEAT_CSCOPE) || defined(PROTO) -#if defined(UNIX) -# include /* pid_t */ -# include /* dev_t, ino_t */ -#else -# if defined (WIN32) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include +#if defined (WIN32) +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN # endif +# include #endif #define CSCOPE_SUCCESS 0 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1431, +/**/ 1430, /**/ 1429,