summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-03-02 20:11:13 +0100
committerJunio C Hamano <gitster@pobox.com>2016-03-02 12:33:43 -0800
commit296d6737331f6287f6be60f6230b51760ed11f98 (patch)
tree1bf01796f755841e5680843768477152e1de35de
parent326e5bc91eecf73234ead29636207bc516573e79 (diff)
downloadgit-js/pthread-exit-emu-windows.tar.gz
Mark win32's pthread_exit() as NORETURNjs/pthread-exit-emu-windows
The pthread_exit() function is not expected to return. Ever. On Windows, we call ExitThread() whose documentation claims: "Ends the calling thread", i.e. there is no condition in which this function simply returns: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682659 While at it, fix the return type to be void, as per http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_exit.html Pointed out by Jeff King, helped by Stefan Naewe, Junio Hamano & Johannes Sixt. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--compat/win32/pthread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index 8ad187344f..799ecf00bc 100644
--- a/compat/win32/pthread.h
+++ b/compat/win32/pthread.h
@@ -75,7 +75,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)ret);
}