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.

diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 00119b8..b4d3a78 100644 (file)
--- 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 04a797b..6070e17 100644 (file)
--- 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 05ab78c..85d115b 100644 (file)
--- 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