Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/pthread-exit-emu-windows'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Mar 2016 21:46:39 +0000
(13:46 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 4 Mar 2016 21:46:39 +0000
(13:46 -0800)
* js/pthread-exit-emu-windows:
Mark win32's pthread_exit() as NORETURN
1
2
compat/win32/pthread.h
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
bbe90e7
296d673
)
diff --cc
compat/win32/pthread.h
index 20b35a283ca71070086728384fffadf98aa17bba,799ecf00bcd8e986940c371b2aa40684e6a86afa..b6ed9e74621fe0bc506beb893e477bff26e88756
---
1
/
compat/win32/pthread.h
---
2
/
compat/win32/pthread.h
+++ b/
compat/win32/pthread.h
@@@
-78,9
-75,9
+78,9
@@@
extern int win32_pthread_join(pthread_
#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);
+ ExitThread((DWORD)
(intptr_t)
ret);
}
typedef DWORD pthread_key_t;