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

(reentry_barrier_mutex): Reimplemented with scm_make_mutex, etc.

Browse source
This commit is contained in:
Marius Vollmer 2002-10-27 20:27:10 +00:00
parent d97eb496fc
commit bb0f37e78f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guile-readline/readline.c
View file

@ -1,6 +1,6 @@
/* readline.c --- line editing support for Guile */ /* readline.c --- line editing support for Guile */
/* Copyright (C) 1997,1999,2000,2001 Free Software Foundation, Inc. /* Copyright (C) 1997,1999,2000,2001, 2002 Free Software Foundation, Inc.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -149,7 +149,7 @@ redisplay ()
static int in_readline = 0; static int in_readline = 0;
#ifdef USE_THREADS #ifdef USE_THREADS
static scm_t_mutex reentry_barrier_mutex; static SCM reentry_barrier_mutex;
#endif #endif
static SCM internal_readline (SCM text); static SCM internal_readline (SCM text);
@ -229,14 +229,14 @@ reentry_barrier ()
int reentryp = 0; int reentryp = 0;
#ifdef USE_THREADS #ifdef USE_THREADS
/* We should rather use scm_t_mutexry_lock when it becomes available */ /* We should rather use scm_t_mutexry_lock when it becomes available */
scm_mutex_lock (&reentry_barrier_mutex); scm_lock_mutex (reentry_barrier_mutex);
#endif #endif
if (in_readline) if (in_readline)
reentryp = 1; reentryp = 1;
else else
++in_readline; ++in_readline;
#ifdef USE_THREADS #ifdef USE_THREADS
scm_mutex_unlock (&reentry_barrier_mutex); scm_unlock_mutex (reentry_barrier_mutex);
#endif #endif
if (reentryp) if (reentryp)
scm_misc_error (s_scm_readline, "readline is not reentrant", SCM_EOL); scm_misc_error (s_scm_readline, "readline is not reentrant", SCM_EOL);
@ -577,7 +577,7 @@ scm_init_readline ()
#endif #endif
#ifdef USE_THREADS #ifdef USE_THREADS
scm_mutex_init (&reentry_barrier_mutex); reentry_barrier_mutex = scm_permanent_object (scm_make_mutex ());
#endif #endif
scm_init_opts (scm_readline_options, scm_init_opts (scm_readline_options,
scm_readline_opts, scm_readline_opts,