Merge branch 'bc/c23'

C23 compatibility updates.

* bc/c23:
  reflog: rename unreachable
  index-pack: rename struct thread_local
This commit is contained in:
Junio C Hamano
2024-11-27 07:57:05 +09:00
2 changed files with 7 additions and 7 deletions

View File

@ -100,7 +100,7 @@ static LIST_HEAD(done_head);
static size_t base_cache_used;
static size_t base_cache_limit;
struct thread_local {
struct thread_local_data {
pthread_t thread;
int pack_fd;
};
@ -123,7 +123,7 @@ static struct object_entry *objects;
static struct object_stat *obj_stat;
static struct ofs_delta_entry *ofs_deltas;
static struct ref_delta_entry *ref_deltas;
static struct thread_local nothread_data;
static struct thread_local_data nothread_data;
static int nr_objects;
static int nr_ofs_deltas;
static int nr_ref_deltas;
@ -161,7 +161,7 @@ static const char *curr_pack;
static struct oidset local_links = OIDSET_INIT;
static int record_local_links;
static struct thread_local *thread_data;
static struct thread_local_data *thread_data;
static int nr_dispatched;
static int threads_active;
@ -403,7 +403,7 @@ static NORETURN void bad_object(off_t offset, const char *format, ...)
(uintmax_t)offset, buf);
}
static inline struct thread_local *get_thread_data(void)
static inline struct thread_local_data *get_thread_data(void)
{
if (HAVE_THREADS) {
if (threads_active)
@ -414,7 +414,7 @@ static inline struct thread_local *get_thread_data(void)
return &nothread_data;
}
static void set_thread_data(struct thread_local *data)
static void set_thread_data(struct thread_local_data *data)
{
if (threads_active)
pthread_setspecific(key, data);