From: Bob Beck Date: Wed, 3 Sep 2025 00:40:22 +0000 (-0600) Subject: qlog_events.h is not a self-contained header file X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7060a2fb0c204eb3a75068f44fadcf60eb7ac7cc;p=thirdparty%2Fopenssl.git qlog_events.h is not a self-contained header file Reviewed-by: Tomas Mraz Reviewed-by: Nikola Pajkovsky Reviewed-by: Norbert Pocs MergeDate: Wed May 6 11:35:42 2026 (Merged from https://github.com/openssl/openssl/pull/31001) --- diff --git a/include/internal/qlog_events.h b/include/internal/qlog_events.inc similarity index 99% rename from include/internal/qlog_events.h rename to include/internal/qlog_events.inc index 6dd44bf3656..8d2ef1b349d 100644 --- a/include/internal/qlog_events.h +++ b/include/internal/qlog_events.inc @@ -6,6 +6,7 @@ * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html */ + QLOG_EVENT(connectivity, connection_started) QLOG_EVENT(connectivity, connection_state_updated) QLOG_EVENT(connectivity, connection_closed) diff --git a/ssl/quic/qlog.c b/ssl/quic/qlog.c index 6f505cf151d..a09c76ca2af 100644 --- a/ssl/quic/qlog.c +++ b/ssl/quic/qlog.c @@ -642,13 +642,14 @@ static void filter_apply(size_t *enabled, int add, const char *cat, size_t cat_l, const char *event, size_t event_l) { - /* Find events which match the given filters. */ -#define QLOG_EVENT(e_cat, e_name) \ - if (filter_match_event(cat, cat_l, event, event_l, \ - #e_cat, #e_name)) \ - bit_set(enabled, QLOG_EVENT_TYPE_##e_cat##_##e_name, add); -#include "internal/qlog_events.h" + /* clang-format off */ + /* Find events which match the given filters. */ +#define QLOG_EVENT(e_cat, e_name) \ + if (filter_match_event(cat, cat_l, event, event_l, #e_cat, #e_name)) \ + bit_set(enabled, QLOG_EVENT_TYPE_##e_cat##_##e_name, add); +#include "internal/qlog_events.inc" #undef QLOG_EVENT + /* clang-format on */ } static int lex_fail(struct lexer *lex, const char *msg)