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 5db5418903b130fefe7bdf2f0edbd86d56f6477d..eaa8ba5f5e3c0baf1fada2a14abf3999e98b0bec 100644 (file)
--- 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 3ab640d21b32378944d2fe498a46f2cba9729e9f..9821bdfc9fc1801294c121d263d7645f0bea185a 100644 (file)
--- 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,
 /**/