From 1bc8792f87eb265005b77d209fc8321886dc5290 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 26 Dec 2024 22:00:27 +0000 Subject: Drop unused short form APT_IGNORE_DEPRECATED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even the long form isn't used much (or currently not at all), but given that the short form is not really working even if it would be used… lets drop it and use the long form if we have to. --- apt-pkg/contrib/macros.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index 7d8a9e2b2..60aba30f4 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -78,15 +78,9 @@ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") #define APT_IGNORE_DEPRECATED_POP \ _Pragma("GCC diagnostic pop") - /* gcc has various problems with this shortcut, so prefer the long form */ - #define APT_IGNORE_DEPRECATED(XXX) \ - APT_IGNORE_DEPRECATED_PUSH \ - XXX \ - APT_IGNORE_DEPRECATED_POP #else #define APT_IGNORE_DEPRECATED_PUSH #define APT_IGNORE_DEPRECATED_POP - #define APT_IGNORE_DEPRECATED(XXX) XXX #endif // These lines are extracted by the makefiles and the buildsystem @@ -139,6 +133,7 @@ AptScopeWrapper(F) -> AptScopeWrapper; #define APT_UNUSED #define APT_MUSTCHECK #endif +#define APT_IGNORE_DEPRECATED(XXX) XXX #endif #endif #endif -- cgit v1.2.3-70-g09d2