diff options
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/readline/Makefile.am | 8 | ||||
| -rw-r--r-- | cmd-line-utils/readline/complete.c | 3 | ||||
| -rw-r--r-- | cmd-line-utils/readline/rltty.c | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cmd-line-utils/readline/Makefile.am b/cmd-line-utils/readline/Makefile.am index f5e41b7e2e9..5fcbcde0516 100644 --- a/cmd-line-utils/readline/Makefile.am +++ b/cmd-line-utils/readline/Makefile.am @@ -20,11 +20,11 @@ libreadline_a_SOURCES = readline.c funmap.c keymaps.c \ shell.c tilde.c misc.c text.c mbutil.c \ compat.c savestring.c -pkginclude_HEADERS = readline.h chardefs.h keymaps.h \ +noinst_HEADERS = readline.h chardefs.h keymaps.h \ history.h tilde.h rlmbutil.h rltypedefs.h rlprivate.h \ - rlshell.h xmalloc.h - -noinst_HEADERS = config_readline.h rldefs.h histlib.h rlwinsize.h \ + rlshell.h xmalloc.h \ +\ + config_readline.h rldefs.h histlib.h rlwinsize.h \ posixstat.h posixdir.h posixjmp.h \ tilde.h rlconf.h rltty.h ansi_stdlib.h \ tcap.h rlstdc.h diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c index d0c9e772f0f..916aa5dd9b9 100644 --- a/cmd-line-utils/readline/complete.c +++ b/cmd-line-utils/readline/complete.c @@ -27,7 +27,8 @@ #include <sys/types.h> #include <fcntl.h> -#if defined (HAVE_SYS_FILE_H) +/* FreeBSD 5.3 will not declare u_int in sys/types.h, file.h needs it */ +#if defined (HAVE_SYS_FILE_H) && !defined(__FreeBSD__) # include <sys/file.h> #endif diff --git a/cmd-line-utils/readline/rltty.c b/cmd-line-utils/readline/rltty.c index b5bc5d367a5..8c896bd3b26 100644 --- a/cmd-line-utils/readline/rltty.c +++ b/cmd-line-utils/readline/rltty.c @@ -141,8 +141,7 @@ static int ksrflow; /* Dummy call to force a backgrounded readline to stop before it tries to get the tty settings. */ static void -set_winsize (tty) - int tty; +set_winsize (int tty __attribute__((unused))) { #if defined (TIOCGWINSZ) struct winsize w; |