mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-14 15:40:19 +02:00
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts: libguile/gc-mark.c libguile/procs.c libguile/procs.h libguile/threads.c libguile/threads.h
This commit is contained in:
commit
f7a1ab8b94
17 changed files with 143 additions and 387 deletions
|
@ -210,7 +210,7 @@ SCM_API int scm_pthread_cond_wait (pthread_cond_t *cond,
|
|||
pthread_mutex_t *mutex);
|
||||
SCM_API int scm_pthread_cond_timedwait (pthread_cond_t *cond,
|
||||
pthread_mutex_t *mutex,
|
||||
const struct timespec *abstime);
|
||||
const scm_t_timespec *abstime);
|
||||
#endif
|
||||
|
||||
/* More convenience functions.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue