From 9e24f0c5c1b1097295d0619d95da66e6b2d83ac9 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 27 Feb 2016 17:22:27 +0100
Subject: patch 7.4.1431 Problem:    Including header files twice. Solution:  
 Remove the extra includes.

---
 src/if_cscope.h | 13 ++++---------
 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
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1431,
 /**/
     1430,
 /**/
-- 
cgit v1.2.1