3 files changed, 5 insertions, 3 deletions
diff --git a/cmd-line-utils/readline/complete.c b/cmd-line-utils/readline/complete.c
index f4c361789b7..526c1edb33d 100644
--- a/cmd-line-utils/readline/complete.c
+++ b/cmd-line-utils/readline/complete.c
@@ -33,7 +33,8 @@
 
 #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/histfile.c b/cmd-line-utils/readline/histfile.c
index a7d6a68098e..f1822b105a4 100644
--- a/cmd-line-utils/readline/histfile.c
+++ b/cmd-line-utils/readline/histfile.c
@@ -334,7 +334,8 @@ history_truncate_file (fname, lines)
   file_size = (size_t)finfo.st_size;
 
   /* check for overflow on very large files */
-  if (file_size != finfo.st_size || file_size + 1 < file_size)
+  if ((long long) file_size != (long long) finfo.st_size ||
+      file_size + 1 < file_size)
     {
       close (file);
 #if defined (EFBIG)
diff --git a/cmd-line-utils/readline/undo.c b/cmd-line-utils/readline/undo.c
index b4b5a6511ba..4d256f492b8 100644
--- a/cmd-line-utils/readline/undo.c
+++ b/cmd-line-utils/readline/undo.c
@@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end)
 
   for (rl = rl_undo_list; rl; rl = rl->next)
     {
-      if (rl->what == (uint) type)
+      if (rl->what == (unsigned int) type)
 	{
 	  rl->start = start;
 	  rl->end = end;