mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 14:00:21 +02:00
Code Activity

Fix --without-threads

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2016-12-07 20:01:00 +01:00
parent b0ccf4dd4a
commit bb87578041
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/dynl.c
View file

@ -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 (&ltdl_lock);
scm_i_dynwind_pthread_mutex_lock (&ltdl_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 (&ltdl_lock);
scm_i_dynwind_pthread_mutex_lock (&ltdl_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 (&ltdl_lock);
scm_i_dynwind_pthread_mutex_lock (&ltdl_lock);
chars = scm_to_locale_string (name);
scm_dynwind_free (chars);
val = sysdep_dynl_value (chars, DYNL_HANDLE (dobj), FUNC_NAME);

4
libguile/gc.c
View file

@ -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))

2
libguile/keywords.c
View file

@ -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);

2
libguile/scmsigs.c
View file

@ -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);

4
libguile/stime.c
View file

@ -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