Merge branch 'sg/diff-multiple-identical-renames' into maint

diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index 20b35a283ca71070086728384fffadf98aa17bba..b6ed9e74621fe0bc506beb893e477bff26e88756 100644 (file)
--- 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);
 }