This commit was generated by cvs2svn to track changes on a CVS vendor

branch.

diff --git a/readline/doc/hsuser.texinfo b/readline/doc/hsuser.texinfo
index 76cb63b1eeee63295b319d9f4fa408f37403b6c3..7c4582d2ace7458d49c8a8def835016ad7c3cc26 100644 (file)
--- a/readline/doc/hsuser.texinfo
+++ b/readline/doc/hsuser.texinfo
@@ -117,7 +117,7 @@ history list and history file.
 @table @code
 
 @item fc
-@btindex fc
+@comment btindex fc
 @example
 @code{fc [-e @var{ename}] [-nlr] [@var{first}] [@var{last}]}
 @code{fc -s [@var{pat}=@var{rep}] [@var{command}]}
@@ -149,7 +149,7 @@ that typing @samp{r cc} runs the last command beginning with @code{cc}
 and typing @samp{r} re-executes the last command (@pxref{Aliases}).
 
 @item history
-@btindex history
+@comment btindex history
 @example
 history [-c] [@var{n}]
 history [-anrw] [@var{filename}]

diff --git a/readline/rltty.c b/readline/rltty.c
index a5ef938b5c06e16a118c9a663d3f7aa51056b2f5..2c7e88679cb5843fb09f290611501ed7e38021bd 100644 (file)
--- a/readline/rltty.c
+++ b/readline/rltty.c
@@ -189,7 +189,9 @@ get_tty_settings (tty, tiop)
      int tty;
      TIOTYPE *tiop;
 {
+#if defined (TIOCGWINSZ)
   set_winsize (tty);
+#endif
 
   tiop->flags = tiop->lflag = 0;
 
@@ -388,7 +390,9 @@ get_tty_settings (tty, tiop)
 {
   int ioctl_ret;
 
+#if defined (TIOCGWINSZ)
   set_winsize (tty);
+#endif
 
   while (1)
     {

diff --git a/readline/shell.c b/readline/shell.c
index 091ec08f645715f13b12bf53459e6f0b5e0deffb..f0ddc897fe42cf0438dcec42ebf18daf9135e4f1 100644 (file)
--- a/readline/shell.c
+++ b/readline/shell.c
@@ -27,6 +27,7 @@
 #endif
 
 #include <sys/types.h>
+#include <stdio.h>
 
 #if defined (HAVE_UNISTD_H)
 #  include <unistd.h>