From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 4 Mar 2016 21:46:39 +0000 (-0800)
Subject: Merge branch 'js/pthread-exit-emu-windows'
X-Git-Tag: v2.8.0-rc1~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3978cd06ffcb62ed94e3b3efcc086f8ed623680f?hp=bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6

Merge branch 'js/pthread-exit-emu-windows'

* js/pthread-exit-emu-windows:
Mark win32's pthread_exit() as NORETURN
---

diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index 20b35a283c..b6ed9e7462 100644
--- a/compat/win32/pthread.h
+++ b/compat/win32/pthread.h
@@ -78,7 +78,7 @@ extern int win32_pthread_join(pthread_t *thread, void **value_ptr);
 #define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
 extern pthread_t pthread_self(void);
 
-static inline int pthread_exit(void *ret)
+static inline void NORETURN pthread_exit(void *ret)
 {
 	ExitThread((DWORD)(intptr_t)ret);
 }