From: Seija Kijin <doremylover123@xxxxxxxxx> The macro works on its own without the helper function Signed-off-by: Seija Kijin <doremylover123@xxxxxxxxx> --- win32: remove return_0 inline function The macro works on its own without the helper function Signed-off-by: Seija Kijin doremylover123@xxxxxxxxx Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1420%2FAtariDreams%2Fcondition-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1420/AtariDreams/condition-v1 Pull-Request: https://github.com/git/git/pull/1420 compat/win32/pthread.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index 737983d00ba..18aa2e1241d 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -18,10 +18,10 @@ */ #define pthread_mutex_t CRITICAL_SECTION -static inline int return_0(int i) { - return 0; +static inline int return_i(int i) { + return i; } -#define pthread_mutex_init(a,b) return_0((InitializeCriticalSection((a)), 0)) +#define pthread_mutex_init(a,b) return_i((InitializeCriticalSection((a)), 0)) #define pthread_mutex_destroy(a) DeleteCriticalSection((a)) #define pthread_mutex_lock EnterCriticalSection #define pthread_mutex_unlock LeaveCriticalSection @@ -36,7 +36,7 @@ typedef int pthread_mutexattr_t; #define pthread_cond_init(a,b) InitializeConditionVariable((a)) #define pthread_cond_destroy(a) do {} while (0) -#define pthread_cond_wait(a,b) return_0(SleepConditionVariableCS((a), (b), INFINITE)) +#define pthread_cond_wait(a,b) SleepConditionVariableCS((a), (b), INFINITE) #define pthread_cond_signal WakeConditionVariable #define pthread_cond_broadcast WakeAllConditionVariable base-commit: 6bae53b138a1f38d8887f6b46d17661357a1468b -- gitgitgadget