Merge branch 'vd/pthread-setspecific-g11-fix' into maint

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
This commit is contained in:
Junio C Hamano 2021-11-04 12:24:20 -07:00
Родитель 494cb27e57 4b540cf913
Коммит 5fbd2fc599
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -1093,7 +1093,7 @@ static NORETURN void die_async(const char *err, va_list params)
static int async_die_is_recursing(void) static int async_die_is_recursing(void)
{ {
void *ret = pthread_getspecific(async_die_counter); 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; return ret != NULL;
} }