Commit a6d151bfed31490fbd34e79db59177a47ec9ee5e
2020-11-21T21:31:41
Merge pull request #5690 from lhchavez/fix-filelimit-compile-error Fix the `-DTHREADSAFE=OFF` build
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/src/runtime.c b/src/runtime.c
index 56110c4..f8e3e3b 100644
--- a/src/runtime.c
+++ b/src/runtime.c
@@ -103,8 +103,8 @@ GIT_INLINE(int) init_unlock(void)
# error unknown threading model
#else
-# define mutex_lock() 0
-# define mutex_unlock() 0
+# define init_lock() git___noop()
+# define init_unlock() git___noop()
#endif
diff --git a/src/thread-utils.h b/src/thread-utils.h
index b4e44b4..e577a9b 100644
--- a/src/thread-utils.h
+++ b/src/thread-utils.h
@@ -235,37 +235,38 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
#else
-GIT_INLINE(int) git_threads_global_init(void) { return 0; }
+GIT_INLINE(int) git___noop(void) { return 0; }
+
+#define git_threads_global_init git___noop
#define git_thread unsigned int
-#define git_thread_create(thread, start_routine, arg) 0
-#define git_thread_join(id, status) (void)0
+#define git_thread_create(thread, start_routine, arg) git___noop()
+#define git_thread_join(id, status) git___noop()
/* Pthreads Mutex */
#define git_mutex unsigned int
-GIT_INLINE(int) git_mutex_init(git_mutex *mutex) \
- { GIT_UNUSED(mutex); return 0; }
-GIT_INLINE(int) git_mutex_lock(git_mutex *mutex) \
- { GIT_UNUSED(mutex); return 0; }
-#define git_mutex_unlock(a) (void)0
-#define git_mutex_free(a) (void)0
+#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()
/* Pthreads condition vars */
#define git_cond unsigned int
-#define git_cond_init(c, a) (void)0
-#define git_cond_free(c) (void)0
-#define git_cond_wait(c, l) (void)0
-#define git_cond_signal(c) (void)0
-#define git_cond_broadcast(c) (void)0
+#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()
/* Pthreads rwlock */
#define git_rwlock unsigned int
-#define git_rwlock_init(a) 0
-#define git_rwlock_rdlock(a) 0
-#define git_rwlock_rdunlock(a) (void)0
-#define git_rwlock_wrlock(a) 0
-#define git_rwlock_wrunlock(a) (void)0
-#define git_rwlock_free(a) (void)0
+#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_STATIC_INIT 0