summaryrefslogtreecommitdiff
path: root/libguile/threads.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-02-14 17:47:24 +0100
committerLudovic Courtès <ludo@gnu.org>2009-02-14 17:47:24 +0100
commitbb2e15a5f4129d0ed9dedb2ac39f3205480c849e (patch)
tree3a1d0723d1d13dc562b1e09ad1a617ac00e2c4d4 /libguile/threads.h
parent4cc889000192b284913b92417afd0f39f7f6f134 (diff)
parentf7a1ab8b946e03f6ad5ccdecba5e8d69b3ce0a1a (diff)
downloadguile-bb2e15a5f4129d0ed9dedb2ac39f3205480c849e.tar.gz
Merge branch 'boehm-demers-weiser-gc' into bdw-gc-static-alloc
Conflicts: .gitignore libguile/procs.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.