From: Sergiu Dotenco <sergiu.dotenco@gmail.com>
Date: Mon, 23 Mar 2015 13:07:38 +0000 (+0100)
Subject: fixed another compilation error
X-Git-Tag: v3.1.900a~103^2~1^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F102%2Fhead;p=thirdparty%2Flibarchive.git

fixed another compilation error
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 5bd81a038..c8c87e0b3 100644
--- 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 430cff043..6ca9f3779 100644
--- 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