From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 16 Feb 2016 19:31:31 +0000 (+0100)
Subject: patch 7.4.1340
X-Git-Tag: v7.4.1340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d63f624603ebeae336d4c504f82ab3da3481f46;p=thirdparty%2Fvim.git

patch 7.4.1340
Problem:    Merge left extra #endif behind.
Solution:   Remove the #endif
---

diff --git a/src/os_win32.c b/src/os_win32.c
index 5db5418903..eaa8ba5f5e 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -353,7 +353,6 @@ wait_for_single_object(
     return WaitForSingleObject(hHandle, dwMilliseconds);
 }
 # endif
-#endif
 #endif
 
     static void
diff --git a/src/version.c b/src/version.c
index 3ab640d21b..9821bdfc9f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1340,
 /**/
     1339,
 /**/