diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 09:23:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 09:23:52 (GMT) |
| commit | 26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff (patch) | |
| tree | b2e5a385fe3e1825f11fa23de5c09cebe91c70a1 /pack-objects.h | |
| parent | 62ca33e02a4ea93dd59538ac986a082430253b27 (diff) | |
| parent | 2179045fd02acca83127f8d15ccd0eeb70b17400 (diff) | |
| download | git-26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff.zip git-26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff.tar.gz git-26b80a841ad6f2ddff855aa9bd0000a4ba81f6ff.tar.bz2 | |
Merge branch 'nd/pthreads'
The codebase has been cleaned up to reduce "#ifndef NO_PTHREADS".
* nd/pthreads:
Clean up pthread_create() error handling
read-cache.c: initialize copy_len to shut up gcc 8
read-cache.c: reduce branching based on HAVE_THREADS
read-cache.c: remove #ifdef NO_PTHREADS
pack-objects: remove #ifdef NO_PTHREADS
preload-index.c: remove #ifdef NO_PTHREADS
grep: clean up num_threads handling
grep: remove #ifdef NO_PTHREADS
attr.c: remove #ifdef NO_PTHREADS
name-hash.c: remove #ifdef NO_PTHREADS
index-pack: remove #ifdef NO_PTHREADS
send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c
run-command.h: include thread-utils.h instead of pthread.h
thread-utils: macros to unconditionally compile pthreads API
Diffstat (limited to 'pack-objects.h')
| -rw-r--r-- | pack-objects.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pack-objects.h b/pack-objects.h index 86ee93f..feb6a6a 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -145,9 +145,7 @@ struct packing_data { struct packed_git **in_pack_by_idx; struct packed_git **in_pack; -#ifndef NO_PTHREADS pthread_mutex_t lock; -#endif /* * This list contains entries for bases which we know the other side @@ -169,15 +167,11 @@ void prepare_packing_data(struct packing_data *pdata); static inline void packing_data_lock(struct packing_data *pdata) { -#ifndef NO_PTHREADS pthread_mutex_lock(&pdata->lock); -#endif } static inline void packing_data_unlock(struct packing_data *pdata) { -#ifndef NO_PTHREADS pthread_mutex_unlock(&pdata->lock); -#endif } struct object_entry *packlist_alloc(struct packing_data *pdata, |