summaryrefslogtreecommitdiff
path: root/libguile/threads.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-02-14 17:32:46 +0100
committerLudovic Courtès <ludo@gnu.org>2009-02-14 17:32:46 +0100
commitf7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (patch)
treebe17320f40e9cfd935238883dee59667cf4bf5bc /libguile/threads.h
parent63385df2fdc2f9bc70804383f071f2fb74743a86 (diff)
parentfe11efeebaa2ebb7bf0fe8bc46a29c152ead2509 (diff)
downloadguile-f7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a.tar.gz
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
Diffstat (limited to 'libguile/threads.h')
-rw-r--r--libguile/threads.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/threads.h b/libguile/threads.h
index 9ce04e1ff..59c7c2c60 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -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.