[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] misc: fix __COUNTER__ macro to be referenced properly
From: |
dnbrdsky |
Subject: |
[PATCH] misc: fix __COUNTER__ macro to be referenced properly |
Date: |
Thu, 19 Mar 2020 09:19:24 -0700 |
From: danbrodsky <address@hidden>
- __COUNTER__ doesn't work with ## concat
- replaced ## with glue() macro so __COUNTER__ is evaluated
Signed-off-by: danbrodsky <address@hidden>
---
include/qemu/lockable.h | 2 +-
include/qemu/rcu.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/qemu/lockable.h b/include/qemu/lockable.h
index 1aeb2cb1a6..a9258f2c2c 100644
--- a/include/qemu/lockable.h
+++ b/include/qemu/lockable.h
@@ -170,7 +170,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QemuLockable,
qemu_lockable_auto_unlock)
* }
*/
#define QEMU_LOCK_GUARD(x) \
- g_autoptr(QemuLockable) qemu_lockable_auto##__COUNTER__ = \
+ g_autoptr(QemuLockable) glue(qemu_lockable_auto, __COUNTER__) = \
qemu_lockable_auto_lock(QEMU_MAKE_LOCKABLE((x)))
#endif
diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h
index 9c82683e37..570aa603eb 100644
--- a/include/qemu/rcu.h
+++ b/include/qemu/rcu.h
@@ -170,7 +170,7 @@ static inline void rcu_read_auto_unlock(RCUReadAuto *r)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock)
#define WITH_RCU_READ_LOCK_GUARD() \
- WITH_RCU_READ_LOCK_GUARD_(_rcu_read_auto##__COUNTER__)
+ WITH_RCU_READ_LOCK_GUARD_(glue(_rcu_read_auto, __COUNTER__))
#define WITH_RCU_READ_LOCK_GUARD_(var) \
for (g_autoptr(RCUReadAuto) var = rcu_read_auto_lock(); \
--
2.25.1