diff options
| author | Julian Andres Klode <jak@debian.org> | 2020-02-18 12:38:14 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2020-02-18 12:38:14 +0000 |
| commit | 9a0a2daa268bd718a4b7fd9617b46ed74c76e94a (patch) | |
| tree | 2b56db6a3e0bcad1389f2ab8663a09d1dc2c0b94 /apt-pkg/contrib/macros.h | |
| parent | dea9a6e3634f674050e525650cf8e7803f62d1da (diff) | |
| parent | e8016805b87bead8eb3dff0d0559c5d9590b721b (diff) | |
Merge branch 'pu/bump-abi6' into 'master'
Bump ABI to 6.0
See merge request apt-team/apt!103
Diffstat (limited to 'apt-pkg/contrib/macros.h')
| -rw-r--r-- | apt-pkg/contrib/macros.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 7e42092f6..f37eb585b 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -116,18 +116,11 @@ // reverse-dependencies of libapt-pkg against the new SONAME. // Non-ABI-Breaks should only increase RELEASE number. // See also buildlib/libversion.mak -#define APT_PKG_MAJOR 5 -#define APT_PKG_MINOR 90 +#define APT_PKG_MAJOR 6 +#define APT_PKG_MINOR 0 #define APT_PKG_RELEASE 0 #define APT_PKG_ABI ((APT_PKG_MAJOR * 100) + APT_PKG_MINOR) - -#if APT_PKG_ABI > 590 -#define APT_PKG_590(msg) __attribute__((error(msg))) -#else -#define APT_PKG_590(msg) -#endif - /* Should be a multiple of the common page size (4096) */ static constexpr unsigned long long APT_BUFFER_SIZE = 64 * 1024; |