mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 12:03:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

index-pack: rename struct thread_local

Browse Source 
"thread_local" is a keyword in C23.  To make sure that our code compiles
on a wide variety of C versions, rename struct thread_local to "struct
thread_local_data" to avoid a conflict.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2024-11-17 01:31:48 +00:00 committed by Junio C Hamano
parent 777489f9e0
commit e8b3bcf491
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/index-pack.c
View File

@ -94,7 +94,7 @@ static LIST_HEAD(done_head);
static size_t base_cache_used; static size_t base_cache_used;
static size_t base_cache_limit; static size_t base_cache_limit;
struct thread_local { struct thread_local_data {
pthread_t thread; pthread_t thread;
int pack_fd; int pack_fd;
}; };
@ -117,7 +117,7 @@ static struct object_entry *objects;
static struct object_stat *obj_stat; static struct object_stat *obj_stat;
static struct ofs_delta_entry *ofs_deltas; static struct ofs_delta_entry *ofs_deltas;
static struct ref_delta_entry *ref_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_objects;
static int nr_ofs_deltas; static int nr_ofs_deltas;
static int nr_ref_deltas; static int nr_ref_deltas;
@ -148,7 +148,7 @@ static uint32_t input_crc32;
static int input_fd, output_fd; static int input_fd, output_fd;
static const char *curr_pack; static const char *curr_pack;
static struct thread_local *thread_data; static struct thread_local_data *thread_data;
static int nr_dispatched; static int nr_dispatched;
static int threads_active; static int threads_active;
@ -390,7 +390,7 @@ static NORETURN void bad_object(off_t offset, const char *format, ...)
(uintmax_t)offset, buf); (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 (HAVE_THREADS) {
if (threads_active) if (threads_active)
@ -401,7 +401,7 @@ static inline struct thread_local *get_thread_data(void)
return &nothread_data; 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) if (threads_active)
pthread_setspecific(key, data); pthread_setspecific(key, data);