IFC

SVN-Revision: 206

diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 6ffc603fc42d605913f63d1fcc25f703f57e18b5..88f4ad857f5d907c61d64978d424d1438205c07d 100644 (file)
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -202,7 +202,7 @@ __LA_DECL dev_t              archive_entry_rdev(struct archive_entry *);
 __LA_DECL dev_t                 archive_entry_rdevmajor(struct archive_entry *);
 __LA_DECL dev_t                 archive_entry_rdevminor(struct archive_entry *);
 __LA_DECL const char   *archive_entry_sourcepath(struct archive_entry *);
-__LA_DECL int64_t       archive_entry_size(struct archive_entry *);
+__LA_DECL __LA_INT64_T  archive_entry_size(struct archive_entry *);
 __LA_DECL int           archive_entry_size_is_set(struct archive_entry *);
 __LA_DECL const char   *archive_entry_strmode(struct archive_entry *);
 __LA_DECL const char   *archive_entry_symlink(struct archive_entry *);
@@ -263,7 +263,7 @@ __LA_DECL void      archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
 __LA_DECL void archive_entry_set_rdev(struct archive_entry *, dev_t);
 __LA_DECL void archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
 __LA_DECL void archive_entry_set_rdevminor(struct archive_entry *, dev_t);
-__LA_DECL void archive_entry_set_size(struct archive_entry *, int64_t);
+__LA_DECL void archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
 __LA_DECL void archive_entry_unset_size(struct archive_entry *);
 __LA_DECL void archive_entry_copy_sourcepath(struct archive_entry *, const char *);
 __LA_DECL void archive_entry_set_symlink(struct archive_entry *, const char *);

diff --git a/libarchive/archive_read_support_compression_program.c b/libarchive/archive_read_support_compression_program.c
index ad2e2c289acd820fe7eb21a67094e2c464b03169..7b54d1ead064cd427f3574bf12576ed2469d2333 100644 (file)
--- a/libarchive/archive_read_support_compression_program.c
+++ b/libarchive/archive_read_support_compression_program.c
@@ -26,6 +26,7 @@
 #include "archive_platform.h"
 __FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_compression_program.c,v 1.5 2008/09/12 03:53:54 kientzle Exp $");
 
+
 /* This capability is only available on POSIX systems. */
 #if !defined(HAVE_PIPE) || !defined(HAVE_FCNTL) || \
     !(defined(HAVE_FORK) || defined(HAVE_VFORK))

diff --git a/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu b/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
index 3f0cfca502150589aa19d5db9a842ab9006eaa3f..6f01fb9b7b2570a60116911472e07eec0a8841b3 100644 (file)
--- a/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
+++ b/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
@@ -1,3 +1,5 @@
+$FreeBSD$
+
 begin 644 test_read_format_isorr_bz2.iso.bz2
 M0EIH.3%!629361M#:2D``,?_W?__6_Y58_GX/__?X*?OWB8AZB0`,`$@`$0"
 M@0C``QP`U:!,&J>FJ>2:CR)^I'ZB#3U/4-`!H:#(:``]0P@`!H9!D!II-$,A