changeset 8277:fa1e3fa56104 v7.4.1431

commit https://github.com/vim/vim/commit/9e24f0c5c1b1097295d0619d95da66e6b2d83ac9 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Feb 27 17:22:27 2016 +0100 patch 7.4.1431 Problem: Including header files twice. Solution: Remove the extra includes.
author Christian Brabandt <cb@256bit.org>
date Sat, 27 Feb 2016 17:30:04 +0100
parents 3a1e67a37adf
children 2946aa80e93a
files src/if_cscope.h src/version.c
diffstat 2 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,