6 files changed, 11 insertions, 11 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/bind.c b/cmd-line-utils/readline/bind.c
index aa5bd3d829a..490691943a8 100644
--- a/cmd-line-utils/readline/bind.c
+++ b/cmd-line-utils/readline/bind.c
@@ -701,7 +701,7 @@ rl_function_of_keyseq (keyseq, map, type)
     {
       unsigned char ic = keyseq[i];
 
-      if (META_BYTE (ic) && _rl_convert_meta_chars_to_ascii)
+      if (META_CHAR_FOR_UCHAR (ic) && _rl_convert_meta_chars_to_ascii)
 	{
 	  if (map[ESC].type == ISKMAP)
 	    {
diff --git a/cmd-line-utils/readline/chardefs.h b/cmd-line-utils/readline/chardefs.h
index 36fe7fdd7ac..0787d9943bb 100644
--- a/cmd-line-utils/readline/chardefs.h
+++ b/cmd-line-utils/readline/chardefs.h
@@ -59,8 +59,8 @@
 #define largest_char 255		    /* Largest character value. */
 
 #define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))
-#define META_BYTE(c) ((c) > meta_character_threshold)
-#define META_CHAR(c) (META_BYTE(c) && (c) <= largest_char)
+#define META_CHAR_FOR_UCHAR(c) ((c) > meta_character_threshold)
+#define META_CHAR(c) (META_CHAR_FOR_UCHAR(c) && (c) <= largest_char)
 
 #define CTRL(c) ((c) & control_character_mask)
 #define META(c) ((c) | meta_character_bit)
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c
index 97423507d5b..2745e4e4801 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/display.c b/cmd-line-utils/readline/display.c
index fa5b67a8e69..f9b88f0006c 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -1893,7 +1893,7 @@ rl_character_len (c, pos)
 
   uc = (unsigned char)c;
 
-  if (META_BYTE (uc))
+  if (META_CHAR_FOR_UCHAR (uc))
     return ((_rl_output_meta_chars == 0) ? 4 : 1);
 
   if (uc == '\t')
diff --git a/cmd-line-utils/readline/rltty.c b/cmd-line-utils/readline/rltty.c
index 08e3ef945ef..8849206fd6d 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;