From 7d63f624603ebeae336d4c504f82ab3da3481f46 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 16 Feb 2016 20:31:31 +0100
Subject: [PATCH] patch 7.4.1340 Problem:    Merge left extra #endif behind.
 Solution:   Remove the #endif

---
 src/os_win32.c | 1 -
 src/version.c  | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/os_win32.c b/src/os_win32.c
index 5db541890..eaa8ba5f5 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 3ab640d21..9821bdfc9 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,
 /**/
-- 
2.50.1