Skip to content

Commit a6d151b

Browse files
authored
Merge pull request libgit2#5690 from lhchavez/fix-filelimit-compile-error
Fix the `-DTHREADSAFE=OFF` build
2 parents 4f4f3bf + aa532e2 commit a6d151b

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

src/runtime.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ GIT_INLINE(int) init_unlock(void)
103103
# error unknown threading model
104104
#else
105105

106-
# define mutex_lock() 0
107-
# define mutex_unlock() 0
106+
# define init_lock() git___noop()
107+
# define init_unlock() git___noop()
108108

109109
#endif
110110

src/thread-utils.h

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -235,37 +235,38 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
235235

236236
#else
237237

238-
GIT_INLINE(int) git_threads_global_init(void) { return 0; }
238+
GIT_INLINE(int) git___noop(void) { return 0; }
239+
240+
#define git_threads_global_init git___noop
239241

240242
#define git_thread unsigned int
241-
#define git_thread_create(thread, start_routine, arg) 0
242-
#define git_thread_join(id, status) (void)0
243+
#define git_thread_create(thread, start_routine, arg) git___noop()
244+
#define git_thread_join(id, status) git___noop()
243245

244246
/* Pthreads Mutex */
245247
#define git_mutex unsigned int
246-
GIT_INLINE(int) git_mutex_init(git_mutex *mutex) \
247-
{ GIT_UNUSED(mutex); return 0; }
248-
GIT_INLINE(int) git_mutex_lock(git_mutex *mutex) \
249-
{ GIT_UNUSED(mutex); return 0; }
250-
#define git_mutex_unlock(a) (void)0
251-
#define git_mutex_free(a) (void)0
248+
#define git_mutex_init(a) git___noop()
249+
#define git_mutex_init(a) git___noop()
250+
#define git_mutex_lock(a) git___noop()
251+
#define git_mutex_unlock(a) git___noop()
252+
#define git_mutex_free(a) git___noop()
252253

253254
/* Pthreads condition vars */
254255
#define git_cond unsigned int
255-
#define git_cond_init(c, a) (void)0
256-
#define git_cond_free(c) (void)0
257-
#define git_cond_wait(c, l) (void)0
258-
#define git_cond_signal(c) (void)0
259-
#define git_cond_broadcast(c) (void)0
256+
#define git_cond_init(c) git___noop()
257+
#define git_cond_free(c) git___noop()
258+
#define git_cond_wait(c, l) git___noop()
259+
#define git_cond_signal(c) git___noop()
260+
#define git_cond_broadcast(c) git___noop()
260261

261262
/* Pthreads rwlock */
262263
#define git_rwlock unsigned int
263-
#define git_rwlock_init(a) 0
264-
#define git_rwlock_rdlock(a) 0
265-
#define git_rwlock_rdunlock(a) (void)0
266-
#define git_rwlock_wrlock(a) 0
267-
#define git_rwlock_wrunlock(a) (void)0
268-
#define git_rwlock_free(a) (void)0
264+
#define git_rwlock_init(a) git___noop()
265+
#define git_rwlock_rdlock(a) git___noop()
266+
#define git_rwlock_rdunlock(a) git___noop()
267+
#define git_rwlock_wrlock(a) git___noop()
268+
#define git_rwlock_wrunlock(a) git___noop()
269+
#define git_rwlock_free(a) git___noop()
269270
#define GIT_RWLOCK_STATIC_INIT 0
270271

271272

0 commit comments

Comments
 (0)