From 50170875992c5de7d6fcc1b3f953502391a8e82b Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Mon, 1 Jun 2020 16:11:08 -0400 Subject: [PATCH] Fix: libc-wrapper: undef temporary token rather than value The lttng-ust malloc wrapper defines pthread_mutex_lock/unlock preprocessor tokens to ust_malloc_spin_lock/unlock around the definition of a TLS variable, which uses pthread mutexes when relying on the pthread key fallback. Undefining those tokens should be done on the preprocessor token, rather than its value. Signed-off-by: Christophe Bedard Signed-off-by: Mathieu Desnoyers Change-Id: I2053b79c88000e272c29b25ca105b1352ecfabd7 --- liblttng-ust-libc-wrapper/lttng-ust-malloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c index f3e1e19e..9e7d1e63 100644 --- a/liblttng-ust-libc-wrapper/lttng-ust-malloc.c +++ b/liblttng-ust-libc-wrapper/lttng-ust-malloc.c @@ -96,8 +96,8 @@ void ust_malloc_spin_unlock(pthread_mutex_t *lock) #define pthread_mutex_lock ust_malloc_spin_lock #define pthread_mutex_unlock ust_malloc_spin_unlock static DEFINE_URCU_TLS(int, malloc_nesting); -#undef ust_malloc_spin_unlock -#undef ust_malloc_spin_lock +#undef pthread_mutex_unlock +#undef pthread_mutex_lock #undef calloc /* -- 2.34.1