1 files changed, 0 insertions, 37 deletions

diff --git a/libarchive/archive_entry.c b/libarchive/archive_entry.c
index deb0abed..93cf3ba9 100644
--- a/libarchive/archive_entry.c
+++ b/libarchive/archive_entry.c
@@ -384,13 +384,8 @@ archive_entry_fflags_text(struct archive_entry *entry)
 	return (f);
 }
 
-#if ARCHIVE_VERSION_NUMBER < 3000000
-gid_t
-archive_entry_gid(struct archive_entry *entry)
-#else
 int64_t
 archive_entry_gid(struct archive_entry *entry)
-#endif
 {
 	return (entry->ae_stat.aest_gid);
 }
@@ -423,19 +418,11 @@ 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)
@@ -553,13 +540,8 @@ archive_entry_symlink_w(struct archive_entry *entry)
 	return (NULL);
 }
 
-#if ARCHIVE_VERSION_NUMBER < 3000000
-uid_t
-archive_entry_uid(struct archive_entry *entry)
-#else
 int64_t
 archive_entry_uid(struct archive_entry *entry)
-#endif
 {
 	return (entry->ae_stat.aest_uid);
 }
@@ -615,13 +597,8 @@ archive_entry_copy_fflags_text_w(struct archive_entry *entry,
 		    &entry->ae_fflags_set, &entry->ae_fflags_clear));
 }
 
-#if ARCHIVE_VERSION_NUMBER < 3000000
-void
-archive_entry_set_gid(struct archive_entry *entry, gid_t g)
-#else
 void
 archive_entry_set_gid(struct archive_entry *entry, int64_t g)
-#endif
 {
 	entry->stat_valid = 0;
 	entry->ae_stat.aest_gid = g;
@@ -651,21 +628,12 @@ archive_entry_update_gname_utf8(struct archive_entry *entry, const char *name)
 	return (archive_mstring_update_utf8(entry->archive, &entry->ae_gname, name));
 }
 
-#if ARCHIVE_VERSION_NUMBER < 3000000
-void
-archive_entry_set_ino(struct archive_entry *entry, unsigned long ino)
-{
-	entry->stat_valid = 0;
-	entry->ae_stat.aest_ino = ino;
-}
-#else
 void
 archive_entry_set_ino(struct archive_entry *entry, int64_t ino)
 {
 	entry->stat_valid = 0;
 	entry->ae_stat.aest_ino = ino;
 }
-#endif
 
 void
 archive_entry_set_ino64(struct archive_entry *entry, int64_t ino)
@@ -976,13 +944,8 @@ archive_entry_update_symlink_utf8(struct archive_entry *entry, const char *linkn
 	return (archive_mstring_update_utf8(entry->archive, &entry->ae_symlink, linkname));
 }
 
-#if ARCHIVE_VERSION_NUMBER < 3000000
-void
-archive_entry_set_uid(struct archive_entry *entry, uid_t u)
-#else
 void
 archive_entry_set_uid(struct archive_entry *entry, int64_t u)
-#endif
 {
 	entry->stat_valid = 0;
 	entry->ae_stat.aest_uid = u;