diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-16 20:31:31 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-16 20:31:31 +0100 |
| commit | 7d63f624603ebeae336d4c504f82ab3da3481f46 (patch) | |
| tree | de81bfd00a865f510107be39d2b11c9560e6c19b | |
| parent | 418f81b5fa400ed59793384f2f3d9df45390f080 (diff) | |
| download | vim-git-7d63f624603ebeae336d4c504f82ab3da3481f46.tar.gz | |
patch 7.4.1340v7.4.1340
Problem: Merge left extra #endif behind.
Solution: Remove the #endif
| -rw-r--r-- | src/os_win32.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 2 insertions, 1 deletions
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 @@ -354,7 +354,6 @@ wait_for_single_object( } # endif #endif -#endif static void get_exe_name(void) diff --git a/src/version.c b/src/version.c index 3ab640d21..9821bdfc9 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 */ /**/ + 1340, +/**/ 1339, /**/ 1338, |