summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Grabmüller <mgrabmue@cs.tu-berlin.de>2001-05-24 06:51:42 +0000
committerMartin Grabmüller <mgrabmue@cs.tu-berlin.de>2001-05-24 06:51:42 +0000
commit90d892e32e07c0d1ad3ac30893e90cb85f0c9246 (patch)
tree9dcaa935ed575ba3c4ec559a3b63ec08a4d0a050
parent1be6b49ccb7b078813668f1decb186116e2e2d18 (diff)
downloadguile-90d892e32e07c0d1ad3ac30893e90cb85f0c9246.tar.gz
Make it compile with --disable-deprecated.
* readline.h: scm_option->scm_option_t. * readline.c (stream_from_fport): scm_fport->scm_fport_t; scm_option->scm_option_t.
-rw-r--r--guile-readline/ChangeLog9
-rw-r--r--guile-readline/readline.c4
-rw-r--r--guile-readline/readline.h2
3 files changed, 12 insertions, 3 deletions
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 00119b8bf..b4d3a7893 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,12 @@
+2001-05-24 Martin Grabmueller <mgrabmue@cs.tu-berlin.de>
+
+ Make it compile with --disable-deprecated.
+
+ * readline.h: scm_option->scm_option_t.
+
+ * readline.c (stream_from_fport): scm_fport->scm_fport_t;
+ scm_option->scm_option_t.
+
2001-05-23 Michael Livshin <mlivshin@bigfoot.com>
* readline.c (strdup): make `len' a size_t.
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index 04a797ba0..6070e174f 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -42,7 +42,7 @@
#include "libguile/validate.h"
#include "guile-readline/readline.h"
-scm_option scm_readline_opts[] = {
+scm_option_t scm_readline_opts[] = {
{ SCM_OPTION_BOOLEAN, "history-file", 1,
"Use history file." },
{ SCM_OPTION_INTEGER, "history-length", 200,
@@ -277,7 +277,7 @@ stream_from_fport (SCM port, char *mode, const char *subr)
int fd;
FILE *f;
- fd = dup (((struct scm_fport *) SCM_STREAM (port))->fdes);
+ fd = dup (((struct scm_fport_t *) SCM_STREAM (port))->fdes);
if (fd == -1)
{
--in_readline;
diff --git a/guile-readline/readline.h b/guile-readline/readline.h
index 05ab78cb0..85d115b4a 100644
--- a/guile-readline/readline.h
+++ b/guile-readline/readline.h
@@ -22,7 +22,7 @@
#include "libguile/__scm.h"
-extern scm_option scm_readline_opts[];
+extern scm_option_t scm_readline_opts[];
#define SCM_HISTORY_FILE_P scm_readline_opts[0].val
#define SCM_HISTORY_LENGTH scm_readline_opts[1].val