diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-27 17:22:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-27 17:22:27 +0100 |
| commit | 9e24f0c5c1b1097295d0619d95da66e6b2d83ac9 (patch) | |
| tree | b1e15ae3d892646ec3adf7a0b184cb2712e20d55 | |
| parent | 7ce686c990ea8c490d16be7f1c6bd95eb48816f9 (diff) | |
| download | vim-git-7.4.1431.tar.gz | |
patch 7.4.1431v7.4.1431
Problem: Including header files twice.
Solution: Remove the extra includes.
| -rw-r--r-- | src/if_cscope.h | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/if_cscope.h b/src/if_cscope.h index b59717017..a572f7385 100644 --- a/src/if_cscope.h +++ b/src/if_cscope.h @@ -11,16 +11,11 @@ #if defined(FEAT_CSCOPE) || defined(PROTO) -#if defined(UNIX) -# include <sys/types.h> /* pid_t */ -# include <sys/stat.h> /* dev_t, ino_t */ -#else -# if defined (WIN32) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include <windows.h> +#if defined (WIN32) +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN # endif +# include <windows.h> #endif #define CSCOPE_SUCCESS 0 diff --git a/src/version.c b/src/version.c index fc8ae7e91..f54913eab 100644 --- 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, |