diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-04 21:46:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-04 21:46:39 (GMT) |
| commit | 3978cd06ffcb62ed94e3b3efcc086f8ed623680f (patch) | |
| tree | 84d7a024d7d824ac5e4914951074926ce33b3f8c /compat | |
| parent | bbe90e7950456bf1bb1ab17a9ee626f6fad7a7c6 (diff) | |
| parent | 296d6737331f6287f6be60f6230b51760ed11f98 (diff) | |
| download | git-3978cd06ffcb62ed94e3b3efcc086f8ed623680f.zip git-3978cd06ffcb62ed94e3b3efcc086f8ed623680f.tar.gz git-3978cd06ffcb62ed94e3b3efcc086f8ed623680f.tar.bz2 | |
Merge branch 'js/pthread-exit-emu-windows'
* js/pthread-exit-emu-windows:
Mark win32's pthread_exit() as NORETURN
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/win32/pthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index 20b35a2..b6ed9e7 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); } |