diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-11-04 19:07:07 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-11-04 19:07:07 +0100 |
commit | 00b8057d1f73c71b8784c38ae54e38a479fbafbd (patch) | |
tree | c87ca489a1d1e5eedda12159b00d3902caf03f23 /libguile/threads.h | |
parent | f8e7dfdc5396fe6e68ec269a4c76e01db9cc7768 (diff) | |
parent | 9c646eee436c0fa4760962bc0c4070892522eff1 (diff) | |
download | guile-00b8057d1f73c71b8784c38ae54e38a479fbafbd.tar.gz |
Merge branch 'master' into boehm-demers-weiser-gc
Conflicts:
libguile/threads.c
Diffstat (limited to 'libguile/threads.h')
-rw-r--r-- | libguile/threads.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libguile/threads.h b/libguile/threads.h index 89e3b0238..9ce04e1ff 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -56,6 +56,7 @@ typedef struct scm_i_thread { scm_i_pthread_mutex_t admin_mutex; SCM mutexes; + scm_i_pthread_mutex_t *held_mutex; SCM result; int canceled; |