diff options
| author | vimboss <devnull@localhost> | 2008-03-16 12:09:58 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2008-03-16 12:09:58 +0000 |
| commit | de1582a66ef49b70388e92621baf60c82ce405de (patch) | |
| tree | 7ae1b9e9936eada4d43f08c963a590949c0a7207 | |
| parent | 9cea97a6112fe48c5d5739e7d2c4a5a7341de0cb (diff) | |
| download | vim-de1582a66ef49b70388e92621baf60c82ce405de.tar.gz | |
| -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 6efa72b3..e76b58dd 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 9811dda6..29951a8d 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, |