diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-04 19:07:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-04 19:07:47 (GMT) |
| commit | a73934c32094339ed41f4134ea8eb4df772f9e69 (patch) | |
| tree | ad5a62e7e010124e38e1b9d18667bcc9c18f364e | |
| parent | ada03fcbeb67001cf2a0b99755472cf49aa8159d (diff) | |
| parent | 4b540cf913b8f528fadb9357530a34ea0dc09737 (diff) | |
| download | git-a73934c32094339ed41f4134ea8eb4df772f9e69.zip git-a73934c32094339ed41f4134ea8eb4df772f9e69.tar.gz git-a73934c32094339ed41f4134ea8eb4df772f9e69.tar.bz2 | |
Merge branch 'vd/pthread-setspecific-g11-fix'
One CI task based on Fedora image noticed a not-quite-kosher
consturct recently, which has been corrected.
* vd/pthread-setspecific-g11-fix:
async_die_is_recursing: work around GCC v11.x issue on Fedora
| -rw-r--r-- | run-command.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c index 7ef5cc7..f40df01 100644 --- a/run-command.c +++ b/run-command.c @@ -1099,7 +1099,7 @@ static NORETURN void die_async(const char *err, va_list params) static int async_die_is_recursing(void) { void *ret = pthread_getspecific(async_die_counter); - pthread_setspecific(async_die_counter, (void *)1); + pthread_setspecific(async_die_counter, &async_die_counter); /* set to any non-NULL valid pointer */ return ret != NULL; } |