summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2024-12-11 13:52:04 +0000
committerDavid Kalnischkies <david@kalnischkies.de>2025-01-05 22:16:08 +0000
commit427f95cedadb5323d35e5174d4592cbdd9c602f4 (patch)
tree83430b42f56e635c34c559f738276d8ddd97ba2d /apt-pkg
parenteb1adc417b0f3c626c545d195e900d1369c751f0 (diff)
Try stomping a little less on global macro namespace
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/contrib/macros.h6
1 files changed, 3 insertions, 3 deletions
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 <class F>
AptScopeWrapper(F) -> AptScopeWrapper<F>;
-#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