commit 18e97e02e76e92cc010999dfa2c785cc712e9d58
author Kelvin Zhang <zhangkelvin@google.com> Mon Sep 25 09:54:16 2023 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Mon Sep 25 20:13:37 2023 -0700
tree f9c804818be5a22675c2dbf6cbdeec2581b1f0e2
parent 316e7c01c1eb374319e61371b7a474a4199920f2

Fix erofs-utils 1.7 compatibility

Test: th
Change-Id: I273fb8937e584fadf8fe7205be75c049a474bdba

common/utils.h

diff --git a/common/utils.h b/common/utils.h
index 6c6337f..0c8c13f 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -642,9 +642,10 @@
   }
 } deferrer;
 
-#define TOKENPASTE(x, y) x##y
-#define DEFER                                                    \
-  auto TOKENPASTE(_deferred_lambda_call, __COUNTER__) = deferrer \
-                                                        << [&]() mutable
+#define TOKENPASTE1(x, y) x##y
+#define TOKENPASTE2(x, y) TOKENPASTE1(x, y)
+#define DEFER                                                     \
+  auto TOKENPASTE2(_deferred_lambda_call, __COUNTER__) = deferrer \
+                                                         << [&]() mutable
 
 #endif  // UPDATE_ENGINE_COMMON_UTILS_H_