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
index b59717017946d9ddcd1bd44fbaae5edacaa05068..a572f7385e3f92f4b82d0c717dbcb92af5f40ccc 100644 (file)
--- 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 fc8ae7e91d198c799ebada2ee5164af15e402b2e..f54913eabe298be7a48e441e508baa3f28dec4b3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1431,
 /**/
     1430,
 /**/