Commit 8413c0f9 by Edward Thomson

util: move git__noop into the util header

The git__noop function is more largely useful; move it into the
util header.  (And reduce the number of underscores.)
parent 87e4597c
...@@ -103,8 +103,8 @@ GIT_INLINE(int) init_unlock(void) ...@@ -103,8 +103,8 @@ GIT_INLINE(int) init_unlock(void)
# error unknown threading model # error unknown threading model
#else #else
# define init_lock() git___noop() # define init_lock() git__noop()
# define init_unlock() git___noop() # define init_unlock() git__noop()
#endif #endif
......
...@@ -235,38 +235,36 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a) ...@@ -235,38 +235,36 @@ GIT_INLINE(int64_t) git_atomic64_get(git_atomic64 *a)
#else #else
GIT_INLINE(int) git___noop(void) { return 0; } #define git_threads_global_init git__noop
#define git_threads_global_init git___noop
#define git_thread unsigned int #define git_thread unsigned int
#define git_thread_create(thread, start_routine, arg) git___noop() #define git_thread_create(thread, start_routine, arg) git__noop()
#define git_thread_join(id, status) git___noop() #define git_thread_join(id, status) git__noop()
/* Pthreads Mutex */ /* Pthreads Mutex */
#define git_mutex unsigned int #define git_mutex unsigned int
#define git_mutex_init(a) git___noop() #define git_mutex_init(a) git__noop()
#define git_mutex_init(a) git___noop() #define git_mutex_init(a) git__noop()
#define git_mutex_lock(a) git___noop() #define git_mutex_lock(a) git__noop()
#define git_mutex_unlock(a) git___noop() #define git_mutex_unlock(a) git__noop()
#define git_mutex_free(a) git___noop() #define git_mutex_free(a) git__noop()
/* Pthreads condition vars */ /* Pthreads condition vars */
#define git_cond unsigned int #define git_cond unsigned int
#define git_cond_init(c) git___noop() #define git_cond_init(c) git__noop()
#define git_cond_free(c) git___noop() #define git_cond_free(c) git__noop()
#define git_cond_wait(c, l) git___noop() #define git_cond_wait(c, l) git__noop()
#define git_cond_signal(c) git___noop() #define git_cond_signal(c) git__noop()
#define git_cond_broadcast(c) git___noop() #define git_cond_broadcast(c) git__noop()
/* Pthreads rwlock */ /* Pthreads rwlock */
#define git_rwlock unsigned int #define git_rwlock unsigned int
#define git_rwlock_init(a) git___noop() #define git_rwlock_init(a) git__noop()
#define git_rwlock_rdlock(a) git___noop() #define git_rwlock_rdlock(a) git__noop()
#define git_rwlock_rdunlock(a) git___noop() #define git_rwlock_rdunlock(a) git__noop()
#define git_rwlock_wrlock(a) git___noop() #define git_rwlock_wrlock(a) git__noop()
#define git_rwlock_wrunlock(a) git___noop() #define git_rwlock_wrunlock(a) git__noop()
#define git_rwlock_free(a) git___noop() #define git_rwlock_free(a) git__noop()
#define GIT_RWLOCK_STATIC_INIT 0 #define GIT_RWLOCK_STATIC_INIT 0
......
...@@ -414,6 +414,8 @@ GIT_INLINE(double) git__timer(void) ...@@ -414,6 +414,8 @@ GIT_INLINE(double) git__timer(void)
extern int git__getenv(git_buf *out, const char *name); extern int git__getenv(git_buf *out, const char *name);
GIT_INLINE(int) git__noop(void) { return 0; }
#include "alloc.h" #include "alloc.h"
#endif #endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment