summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-10 19:35:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-10 19:35:45 (GMT)
commit39fd762572d42a118e577d9095d83d84f3db9ddf (patch)
treeeee783d514a11783ae329f5ebbf9a41ba076263f /compat
parent1462b67bc893fc845d28e2748c20357cb16a5ce3 (diff)
parent362de916c06521205276acb7f51c99f47db94727 (diff)
downloadgit-39fd762572d42a118e577d9095d83d84f3db9ddf.zip
git-39fd762572d42a118e577d9095d83d84f3db9ddf.tar.gz
git-39fd762572d42a118e577d9095d83d84f3db9ddf.tar.bz2
Sync with 1.8.3.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
-rw-r--r--compat/mingw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index b295e2f..bb92c43 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1677,14 +1677,16 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
#undef signal
sig_handler_t mingw_signal(int sig, sig_handler_t handler)
{
- sig_handler_t old = timer_fn;
+ sig_handler_t old;
switch (sig) {
case SIGALRM:
+ old = timer_fn;
timer_fn = handler;
break;
case SIGINT:
+ old = sigint_fn;
sigint_fn = handler;
break;