From ee7e6f676e4862bcea2f74b3b41ceaf0b0a40040 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Wed, 31 Oct 2018 19:37:11 +0000 Subject: [PATCH] Define QMD_SAVELINK() only for QUEUE_MACRO_DEBUG_TRASH case. Otherwise with QUEUE_MACRO_DEBUG_TRACE compilation fails due to unused variable. --- sys/sys/queue.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/sys/queue.h b/sys/sys/queue.h index 2e961ddc7e0..94fd1ce7b66 100644 --- a/sys/sys/queue.h +++ b/sys/sys/queue.h @@ -155,19 +155,15 @@ struct qm_trace { #endif /* QUEUE_MACRO_DEBUG_TRACE */ #ifdef QUEUE_MACRO_DEBUG_TRASH +#define QMD_SAVELINK(name, link) void **name = (void *)&(link) #define TRASHIT(x) do {(x) = (void *)-1;} while (0) #define QMD_IS_TRASHED(x) ((x) == (void *)(intptr_t)-1) #else /* !QUEUE_MACRO_DEBUG_TRASH */ +#define QMD_SAVELINK(name, link) #define TRASHIT(x) #define QMD_IS_TRASHED(x) 0 #endif /* QUEUE_MACRO_DEBUG_TRASH */ -#if defined(QUEUE_MACRO_DEBUG_TRACE) || defined(QUEUE_MACRO_DEBUG_TRASH) -#define QMD_SAVELINK(name, link) void **name = (void *)&(link) -#else /* !QUEUE_MACRO_DEBUG_TRACE && !QUEUE_MACRO_DEBUG_TRASH */ -#define QMD_SAVELINK(name, link) -#endif /* QUEUE_MACRO_DEBUG_TRACE || QUEUE_MACRO_DEBUG_TRASH */ - #ifdef __cplusplus /* * In C++ there can be structure lists and class lists: