In libarchive 3.0, archive_entry_ino() returns int64_t instead of ino_t.

SVN-Revision: 1912

diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index 4ddc7597924ecb5e6a7a38a18a4d8aa646114b9b..b328b17dc2c791a979e9e307aeaf49469382d1bc 100644 (file)
--- a/libarchive/archive_entry.c
+++ b/libarchive/archive_entry.c
@@ -643,11 +643,19 @@ archive_entry_hardlink_w(struct archive_entry *entry)
        return (NULL);
 }
 
+#if ARCHIVE_VERSION_NUMBER < 3000000
 ino_t
 archive_entry_ino(struct archive_entry *entry)
 {
        return (entry->ae_stat.aest_ino);
 }
+#else
+int64_t
+archive_entry_ino(struct archive_entry *entry)
+{
+       return (entry->ae_stat.aest_ino);
+}
+#endif
 
 int64_t
 archive_entry_ino64(struct archive_entry *entry)

diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index abd0be57ade58bbc664568441b6aa844a640d30f..c74bcca292c32f5b9f678c9bd9852f6622469a6d 100644 (file)
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -204,7 +204,11 @@ __LA_DECL const char       *archive_entry_gname(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_gname_w(struct archive_entry *);
 __LA_DECL const char   *archive_entry_hardlink(struct archive_entry *);
 __LA_DECL const wchar_t        *archive_entry_hardlink_w(struct archive_entry *);
+#if ARCHIVE_VERSION_NUMBER < 3000000
 __LA_DECL __LA_INO_T    archive_entry_ino(struct archive_entry *);
+#else
+__LA_DECL __LA_INT64_T  archive_entry_ino(struct archive_entry *);
+#endif
 __LA_DECL __LA_INT64_T  archive_entry_ino64(struct archive_entry *);
 __LA_DECL __LA_MODE_T   archive_entry_mode(struct archive_entry *);
 __LA_DECL time_t        archive_entry_mtime(struct archive_entry *);