diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2023-01-20 22:31:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-20 22:31:22 +0000 |
| commit | 4d47ad6fc5c413093e7ffae50e0f8ecfba431696 (patch) | |
| tree | a7b28d38c69e21ba83da508c8424437071b49cfd | |
| parent | d3f554fd67d0b2028705ecc41c79110c12b86776 (diff) | |
| parent | 48850882d7a2f78c52f3f06072b10c6cd5659a5a (diff) | |
| download | libgit2-4d47ad6fc5c413093e7ffae50e0f8ecfba431696.tar.gz | |
Merge pull request #6432 from libgit2/ethomson/noop_args
thread: avoid warnings when building without threads
| -rw-r--r-- | src/util/thread.h | 39 | ||||
| -rw-r--r-- | src/util/util.h | 1 |
2 files changed, 21 insertions, 19 deletions
diff --git a/src/util/thread.h b/src/util/thread.h index 4bbac9fd8..c32554bfd 100644 --- a/src/util/thread.h +++ b/src/util/thread.h @@ -260,36 +260,37 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a) #else -#define git_threads_global_init git__noop +#define git_threads_global_init git__noop #define git_thread unsigned int -#define git_thread_create(thread, start_routine, arg) git__noop() -#define git_thread_join(id, status) git__noop() +#define git_thread_create(t, s, a) git__noop(t, s, a) +#define git_thread_join(i, s) git__noop_args(i, s) /* Pthreads Mutex */ #define git_mutex unsigned int -#define git_mutex_init(a) git__noop() -#define git_mutex_init(a) git__noop() -#define git_mutex_lock(a) git__noop() -#define git_mutex_unlock(a) git__noop() -#define git_mutex_free(a) git__noop() +#define git_mutex_init(a) git__noop_args(a) +#define git_mutex_init(a) git__noop_args(a) +#define git_mutex_lock(a) git__noop_args(a) +#define git_mutex_unlock(a) git__noop_args(a) +#define git_mutex_free(a) git__noop_args(a) /* Pthreads condition vars */ #define git_cond unsigned int -#define git_cond_init(c) git__noop() -#define git_cond_free(c) git__noop() -#define git_cond_wait(c, l) git__noop() -#define git_cond_signal(c) git__noop() -#define git_cond_broadcast(c) git__noop() +#define git_cond_init(c) git__noop_args(c) +#define git_cond_free(c) git__noop_args(c) +#define git_cond_wait(c, l) git__noop_args(c, l) +#define git_cond_signal(c) git__noop_args(c) +#define git_cond_broadcast(c) git__noop_args(c) /* Pthreads rwlock */ #define git_rwlock unsigned int -#define git_rwlock_init(a) git__noop() -#define git_rwlock_rdlock(a) git__noop() -#define git_rwlock_rdunlock(a) git__noop() -#define git_rwlock_wrlock(a) git__noop() -#define git_rwlock_wrunlock(a) git__noop() -#define git_rwlock_free(a) git__noop() +#define git_rwlock_init(a) git__noop_args(a) +#define git_rwlock_rdlock(a) git__noop_args(a) +#define git_rwlock_rdunlock(a) git__noop_args(a) +#define git_rwlock_wrlock(a) git__noop_args(a) +#define git_rwlock_wrunlock(a) git__noop_args(a) +#define git_rwlock_free(a) git__noop_args(a) + #define GIT_RWLOCK_STATIC_INIT 0 diff --git a/src/util/util.h b/src/util/util.h index 8d6d1d6b6..63d6080f7 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -381,6 +381,7 @@ extern int git__getenv(git_str *out, const char *name); extern int git__online_cpus(void); GIT_INLINE(int) git__noop(void) { return 0; } +GIT_INLINE(int) git__noop_args(void *a, ...) { GIT_UNUSED(a); return 0; } #include "alloc.h" |