From 427f95cedadb5323d35e5174d4592cbdd9c602f4 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 11 Dec 2024 13:52:04 +0000 Subject: Try stomping a little less on global macro namespace --- apt-pkg/contrib/macros.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg') diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h index d6f9c2f98..7a4c863d7 100644 --- a/apt-pkg/contrib/macros.h +++ b/apt-pkg/contrib/macros.h @@ -135,8 +135,8 @@ struct AptScopeWrapper { }; template AptScopeWrapper(F) -> AptScopeWrapper; -#define PASTE2(a, b) a##b -#define PASTE(a, b) PASTE2(a, b) -#define DEFER(lambda) AptScopeWrapper PASTE(defer, __LINE__){lambda}; +#define APT_PASTE2(a, b) a##b +#define APT_PASTE(a, b) APT_PASTE2(a, b) +#define DEFER(lambda) AptScopeWrapper APT_PASTE(defer, __LINE__){lambda}; #endif -- cgit v1.2.3-70-g09d2