diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-13 11:03:57 +0100 |
| commit | 8fa17b13062c1e2acca542cc7a2ccb09aca874e8 (patch) | |
| tree | 158a6239b0fdf2abf63fb7365b4cd4886c15f5b1 /pthreads/nonportable.c | |
| parent | 4a165ef2f762a4ce9155f2a3626692326bda616d (diff) | |
| parent | b41f74438672dd682bc01ae818cb3da654f22c1e (diff) | |
| download | vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.gz vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.tar.bz2 vcxsrv-8fa17b13062c1e2acca542cc7a2ccb09aca874e8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Updated to latest CVS version of pthreads
Conflicts:
pthreads/Makefile
Diffstat (limited to 'pthreads/nonportable.c')
| -rw-r--r-- | pthreads/nonportable.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pthreads/nonportable.c b/pthreads/nonportable.c index 742cb969b..3ac8189e6 100644 --- a/pthreads/nonportable.c +++ b/pthreads/nonportable.c @@ -42,6 +42,7 @@ #include "pthread_getw32threadhandle_np.c" #include "pthread_getunique_np.c" #include "pthread_delay_np.c" +#include "pthread_timedjoin_np.c" #include "pthread_num_processors_np.c" #include "pthread_win32_attach_detach_np.c" #include "pthread_timechange_handler_np.c" |