diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2024-11-17 01:31:48 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-18 09:42:08 +0900 |
| commit | e8b3bcf49120309b207b7afc25c4aa81b866ac45 (patch) | |
| tree | d068a6d860eaf6dcbf212b5ec2a02afce8f0c342 | |
| parent | Git 2.47 (diff) | |
| download | git-e8b3bcf49120309b207b7afc25c4aa81b866ac45.tar.gz git-e8b3bcf49120309b207b7afc25c4aa81b866ac45.zip | |
index-pack: rename struct thread_local
"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>
| -rw-r--r-- | builtin/index-pack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index e228c56ff2..74675dbd6c 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -94,7 +94,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; }; @@ -117,7 +117,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; @@ -148,7 +148,7 @@ static uint32_t input_crc32; static int input_fd, output_fd; static const char *curr_pack; -static struct thread_local *thread_data; +static struct thread_local_data *thread_data; static int nr_dispatched; static int threads_active; @@ -390,7 +390,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) @@ -401,7 +401,7 @@ static inline struct thread_local *get_thread_data(void) return ¬hread_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); |