fixed another compilation error

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 5bd81a0387882364f78e2d02a0ced89c21a95cbf..c8c87e0b39114b1a63fab87d31b0cdd932d11ff9 100644 (file)
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -4075,7 +4075,7 @@ archive_mstring_copy_utf8(struct archive_mstring *aes, const char *utf8)
   archive_string_empty(&(aes->aes_mbs));
   archive_string_empty(&(aes->aes_wcs));
   archive_strncpy(&(aes->aes_utf8), utf8, strlen(utf8));
-  return strlen(utf8);
+  return (int)strlen(utf8);
 }
 
 int

diff --git a/tar/read.c b/tar/read.c
index 430cff0439a0f59f18da67bf29c57c2ed046dae4..6ca9f37798812c02b906d4918a88963ede0db320 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -39,9 +39,19 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/read.c,v 1.40 2008/08/21 06:41:14 kientzle E
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
 #ifdef HAVE_GRP_H
 #include <grp.h>
 #endif
+
+#ifdef HAVE_IO_H
+#include <io.h>
+#endif
+
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif