From: Christophe Bedard Date: Mon, 1 Jun 2020 20:11:08 +0000 (-0400) Subject: Fix: libc-wrapper: undef temporary token rather than value X-Git-Tag: v2.13.0-rc1~494 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=50170875992c5de7d6fcc1b3f953502391a8e82b;p=lttng-ust.git 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 --- 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 /*