From 24fb86d3020d750d66fe6ba96b9e6b8c6d356eb9 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Wed, 17 Feb 2010 02:07:37 -0500 Subject: [PATCH] In libarchive 3.0, archive_entry_ino() returns int64_t instead of ino_t. SVN-Revision: 1912 --- libarchive/archive_entry.c | 8 ++++++++ libarchive/archive_entry.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c index 4ddc75979..b328b17dc 100644 --- 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 abd0be57a..c74bcca29 100644 --- 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 *); -- 2.47.3