diff options
author | Bram Moolenaar <Bram@vim.org> | 2008-03-16 12:09:58 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2008-03-16 12:09:58 +0000 |
commit | 9701da0169c39ff259f281abfed7f3b4c1dbfc27 (patch) | |
tree | 7ae1b9e9936eada4d43f08c963a590949c0a7207 | |
parent | 4c4f7105d26a018cd7ec674105082d99ea3420c4 (diff) | |
download | vim-git-9701da0169c39ff259f281abfed7f3b4c1dbfc27.tar.gz |
updated for version 7.1-281v7.1.281
-rw-r--r-- | src/if_cscope.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/if_cscope.c b/src/if_cscope.c index 6efa72b3d..e76b58dd7 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -2136,7 +2136,8 @@ cs_release_csp(i, freefnpp) # if defined(HAVE_SIGACTION) struct sigaction sa, old; - /* Use sigaction() to limit the waiting time to two seconds. */ + /* Use sigaction() to limit the waiting time to two seconds. */ + sigemptyset(&sa.sa_mask); sa.sa_handler = sig_handler; sa.sa_flags = SA_NODEFER; sigaction(SIGALRM, &sa, &old); @@ -2169,7 +2170,7 @@ cs_release_csp(i, freefnpp) */ if (pid < 0 && csinfo[i].pid > 1) { - kill(csinfo[i].pid, SIGTERM); + kill(csinfo[i].pid, SIGKILL); (void)waitpid(csinfo[i].pid, &pstat, 0); } } diff --git a/src/version.c b/src/version.c index 9811dda6a..29951a8db 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 281, +/**/ 280, /**/ 279, |