X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flogging%2Flog.c;h=349204e8148fa24f047dc6fd0b98ff39f6017d57;hb=156184d68ce8a9338e042908c522255e3eed800d;hp=093930d222ff0dff47b22a6c748af5c8e30653c7;hpb=78deb9134e34490c8d90825d7f4778f86b96aa73;p=babeltrace.git

diff --git a/src/logging/log.c b/src/logging/log.c
index 093930d2..349204e8 100644
--- a/src/logging/log.c
+++ b/src/logging/log.c
@@ -1148,9 +1148,21 @@ static void put_ctx(bt_log_message *const msg)
 static void put_tag(bt_log_message *const msg, const char *const tag)
 {
 	_PP_MAP(_BT_LOG_MESSAGE_FORMAT_INIT, BT_LOG_MESSAGE_TAG_FORMAT)
+
+/*
+ * This generates a -Wundef warning.  The issue was reported upstream:
+ *
+ *   https://github.com/wonder-mice/zf_log/issues/40
+ *
+ * but there's not much we can do here, so just silence it.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wundef"
 #if !_BT_LOG_MESSAGE_FORMAT_CONTAINS(TAG, BT_LOG_MESSAGE_TAG_FORMAT)
 	VAR_UNUSED(tag);
 #endif
+#pragma GCC diagnostic pop
+
 #if !_BT_LOG_MESSAGE_FORMAT_FIELDS(BT_LOG_MESSAGE_TAG_FORMAT)
 	VAR_UNUSED(msg);
 #else