summaryrefslogtreecommitdiff
path: root/guile-readline/readline.c
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>2000-06-14 15:03:01 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>2000-06-14 15:03:01 +0000
commit48552b1dcf528ca96353e90ac14fdeb5eb87dc14 (patch)
treeeaebbd8f5b7562dbc944553448b439928f760861 /guile-readline/readline.c
parent0f0f08998d432675d43929aa4900e149d524eca4 (diff)
downloadguile-48552b1dcf528ca96353e90ac14fdeb5eb87dc14.tar.gz
* readline.c (scm_readline): Added parenthesis around && within
||. Fixed up prototype for `reentry_barrier'. Conditionally #include <unistd.h>. (Needed for `dup'.)
Diffstat (limited to 'guile-readline/readline.c')
-rw-r--r--guile-readline/readline.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index 9f3d14ff7..09ce69545 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -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,