Fredrik Fornwall
8 years ago
2 changed files with 28 additions and 8 deletions
@ -0,0 +1,25 @@ |
|||
diff -u -r ../git-2.13.2/run-command.c ./run-command.c
|
|||
--- ../git-2.13.2/run-command.c 2017-06-25 00:50:12.000000000 +0200
|
|||
+++ ./run-command.c 2017-06-25 20:16:53.815627960 +0200
|
|||
@@ -491,8 +491,10 @@
|
|||
#else |
|||
bug_die(pthread_sigmask(SIG_SETMASK, &all, &as->old), |
|||
"blocking all signals"); |
|||
+# ifndef __ANDROID__
|
|||
bug_die(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs), |
|||
"disabling cancellation"); |
|||
+# endif
|
|||
#endif |
|||
} |
|||
|
|||
@@ -502,8 +504,10 @@
|
|||
if (sigprocmask(SIG_SETMASK, &as->old, NULL)) |
|||
die_errno("sigprocmask"); |
|||
#else |
|||
+# ifndef __ANDROID__
|
|||
bug_die(pthread_setcancelstate(as->cs, NULL), |
|||
"re-enabling cancellation"); |
|||
+# endif
|
|||
bug_die(pthread_sigmask(SIG_SETMASK, &as->old, NULL), |
|||
"restoring signal mask"); |
|||
#endif |
Loading…
Reference in new issue