[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/02: Fix --without-threads
From: |
Andy Wingo |
Subject: |
[Guile-commits] 01/02: Fix --without-threads |
Date: |
Wed, 7 Dec 2016 19:39:58 +0000 (UTC) |
wingo pushed a commit to branch master
in repository guile.
commit bb87578041a453b20f5a28dec3214a9e79a43f4b
Author: Andy Wingo <address@hidden>
Date: Wed Dec 7 20:01:00 2016 +0100
Fix --without-threads
* libguile/dynl.c:
* libguile/gc.c:
* libguile/keywords.c:
* libguile/scmsigs.c:
* libguile/stime.c: Use scm_i_dynamic_link instead of scm_dynamic_link
so that things compile in without-threads configurations.
---
libguile/dynl.c | 6 +++---
libguile/gc.c | 4 ++--
libguile/keywords.c | 2 +-
libguile/scmsigs.c | 2 +-
libguile/stime.c | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libguile/dynl.c b/libguile/dynl.c
index b1c9fb3..b9497b1 100644
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@@ -253,7 +253,7 @@ SCM_DEFINE (scm_dynamic_link, "dynamic-link", 0, 1, 0,
char *file;
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (<dl_lock);
+ scm_i_dynwind_pthread_mutex_lock (<dl_lock);
if (SCM_UNBNDP (filename))
file = NULL;
@@ -298,7 +298,7 @@ SCM_DEFINE (scm_dynamic_unlink, "dynamic-unlink", 1, 0, 0,
SCM_VALIDATE_SMOB (SCM_ARG1, dobj, dynamic_obj);
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (<dl_lock);
+ scm_i_dynwind_pthread_mutex_lock (<dl_lock);
if (DYNL_HANDLE (dobj) == NULL) {
SCM_MISC_ERROR ("Already unlinked: ~S", scm_list_1 (dobj));
} else {
@@ -335,7 +335,7 @@ SCM_DEFINE (scm_dynamic_pointer, "dynamic-pointer", 2, 0, 0,
char *chars;
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (<dl_lock);
+ scm_i_dynwind_pthread_mutex_lock (<dl_lock);
chars = scm_to_locale_string (name);
scm_dynwind_free (chars);
val = sysdep_dynl_value (chars, DYNL_HANDLE (dobj), FUNC_NAME);
diff --git a/libguile/gc.c b/libguile/gc.c
index 2b3bd36..648c678 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -401,7 +401,7 @@ scm_gc_protect_object (SCM obj)
SCM handle;
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (&gc_protect_lock);
+ scm_i_dynwind_pthread_mutex_lock (&gc_protect_lock);
handle = scm_hashq_create_handle_x (scm_protects, obj, scm_from_int (0));
SCM_SETCDR (handle, scm_sum (SCM_CDR (handle), scm_from_int (1)));
@@ -423,7 +423,7 @@ scm_gc_unprotect_object (SCM obj)
SCM handle;
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (&gc_protect_lock);
+ scm_i_dynwind_pthread_mutex_lock (&gc_protect_lock);
handle = scm_hashq_get_handle (scm_protects, obj);
if (scm_is_false (handle))
diff --git a/libguile/keywords.c b/libguile/keywords.c
index 2c60789..0ead336 100644
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@@ -63,7 +63,7 @@ SCM_DEFINE (scm_symbol_to_keyword, "symbol->keyword", 1, 0, 0,
SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, 0, NULL, "symbol");
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (&scm_i_misc_mutex);
+ scm_i_dynwind_pthread_mutex_lock (&scm_i_misc_mutex);
/* Note: `scm_cell' and `scm_hashq_set_x' can raise an out-of-memory
error. */
keyword = scm_hashq_ref (keyword_obarray, symbol, SCM_BOOL_F);
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c
index da2c3d1..36143af 100644
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@@ -336,7 +336,7 @@ SCM_DEFINE (scm_sigaction_for_thread, "sigaction", 1, 3, 0,
scm_i_ensure_signal_delivery_thread ();
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (&signal_handler_lock);
+ scm_i_dynwind_pthread_mutex_lock (&signal_handler_lock);
scm_dynwind_block_asyncs ();
old_handler = SCM_SIMPLE_VECTOR_REF (*signal_handlers, csig);
diff --git a/libguile/stime.c b/libguile/stime.c
index f5b7000..4f35766 100644
--- a/libguile/stime.c
+++ b/libguile/stime.c
@@ -393,7 +393,7 @@ SCM_DEFINE (scm_localtime, "localtime", 1, 1, 0,
/* Mutual exclusion is essential since a) setzone may install a
temporary environment b) localtime uses a static buffer. */
scm_dynwind_begin (0);
- scm_dynwind_pthread_mutex_lock (&tz_lock);
+ scm_i_dynwind_pthread_mutex_lock (&tz_lock);
oldenv = setzone (zone, SCM_ARG2, FUNC_NAME);
#ifdef LOCALTIME_CACHE
@@ -553,7 +553,7 @@ SCM_DEFINE (scm_mktime, "mktime", 1, 1, 0,
scm_dynwind_free ((char *)lt.tm_zone);
#endif
- scm_dynwind_pthread_mutex_lock (&tz_lock);
+ scm_i_dynwind_pthread_mutex_lock (&tz_lock);
oldenv = setzone (zone, SCM_ARG2, FUNC_NAME);
#ifdef LOCALTIME_CACHE