diff options
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 6 | ||||
| -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 |
4 files changed, 10 insertions, 10 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index bb4b40180d1..23ee20894ec 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -20,9 +20,9 @@ EXTRA_libedit_a_SOURCES = np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \ libedit_a_LIBADD = @LIBEDIT_LOBJECTS@ libedit_a_DEPENDENCIES = @LIBEDIT_LOBJECTS@ -pkginclude_HEADERS = readline/readline.h - -noinst_HEADERS = chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \ +noinst_HEADERS = readline/readline.h \ +\ + chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \ sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \ search.h tty.h libedit_term.h vis.h 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 73f834a68a7..a0232b2afdf 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 0a570f85840..12f3a93e524 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; |