From 6e877571bc2dd50e38f2f35675c401d74dbe233d Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Sat, 15 Feb 2025 09:40:15 +0100
Subject: Run unifdef -DAPT_PKG_ABI=700 again

main picked up a couple new ifdefs since the branch started; so
clean them up again.
---
 apt-pkg/pkgcache.h | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'apt-pkg/pkgcache.h')

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index ed445b5bc..22eea3f6c 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -340,13 +340,8 @@ struct pkgCache::Header
    map_id_t DependsDataCount;
    map_fileid_t ReleaseFileCount;
    map_fileid_t PackageFileCount;
-#if APT_PKG_ABI <= 600
-   map_fileid_t VerFileCount;
-   map_fileid_t DescFileCount;
-#else
    map_id_t VerFileCount;
    map_id_t DescFileCount;
-#endif
    map_id_t ProvidesCount;
 
    /** \brief index of the first PackageFile structure
@@ -603,9 +598,6 @@ struct pkgCache::VerFile
    map_pointer<VerFile> NextFile;
    /** \brief position in the package file */
    map_filesize_t Offset;         // File offset
-#if APT_PKG_ABI <= 600
-   [[deprecated("No usage in src:apt, try MaxVerFileSize instead")]] map_filesize_t Size;
-#endif
 };
 									/*}}}*/
 // DescFile structure							/*{{{*/
@@ -618,9 +610,6 @@ struct pkgCache::DescFile
    map_pointer<DescFile> NextFile;
    /** \brief position in the file */
    map_filesize_t Offset;         // File offset
-#if APT_PKG_ABI <= 600
-   [[deprecated("No usage in src:apt, try MaxDescFileSize instead")]] map_filesize_t Size;
-#endif
 };
 									/*}}}*/
 // Version structure							/*{{{*/
-- 
cgit v1.2.3-70-g09d2