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

* readline.c (scm_readline): Added parenthesis around && within

||.
Fixed up prototype for `reentry_barrier'.
Conditionally #include <unistd.h>.  (Needed for `dup'.)
This commit is contained in:
Mikael Djurfeldt 2000-06-14 15:03:01 +00:00
parent 0f0f08998d
commit 48552b1dcf

View file

@ -30,6 +30,9 @@
#include "libguile/gh.h"
#include "libguile/iselect.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <readline/readline.h>
#include <readline/history.h>
#include <sys/time.h>
@ -147,7 +150,7 @@ static scm_mutex_t reentry_barrier_mutex;
static SCM internal_readline (SCM text);
static SCM handle_error (void *data, SCM tag, SCM args);
static void reentry_barrier ();
static void reentry_barrier (void);
SCM_DEFINE (scm_readline, "%readline", 0, 4, 0,
@ -172,7 +175,7 @@ SCM_DEFINE (scm_readline, "%readline", 0, 4, 0,
}
if (!((SCM_UNBNDP (inp) && SCM_NIMP (scm_cur_inp) && SCM_OPINFPORTP (inp))
|| SCM_NIMP (inp) && SCM_OPINFPORTP (inp)))
|| (SCM_NIMP (inp) && SCM_OPINFPORTP (inp))))
{
--in_readline;
scm_misc_error (s_scm_readline,