commit 7d63f624603ebeae336d4c504f82ab3da3481f46
author Bram Moolenaar <Bram@vim.org> Tue Feb 16 20:31:31 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Tue Feb 16 20:31:31 2016 +0100
tree de81bfd00a865f510107be39d2b11c9560e6c19b
parent 418f81b5fa400ed59793384f2f3d9df45390f080

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

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index 5db5418..eaa8ba5 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -354,7 +354,6 @@
 }
 # endif
 #endif
-#endif
 
     static void
 get_exe_name(void)

src/version.c

diff --git a/src/version.c b/src/version.c
index 3ab640d..9821bdf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1340,
+/**/
     1339,
 /**/
     1338,