From d07bb59bbdf2e6e83ed619b285f84a4f37bb6cec Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Tue, 24 Sep 2024 20:54:36 +0200 Subject: [PATCH] internal/list.h: rename LIST_FOREACH to OSSL_LIST_FOREACH This prevents clash with /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/sys/queue.h --- include/internal/list.h | 2 +- ssl/quic/quic_engine.c | 2 +- ssl/quic/quic_port.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/internal/list.h b/include/internal/list.h index 902047641f7bb3..33942f439eb222 100644 --- a/include/internal/list.h +++ b/include/internal/list.h @@ -24,7 +24,7 @@ for ((p) = (init); \ (p) != NULL; \ (p) = ossl_list_##name##_next(p)) -# define LIST_FOREACH(p, name, l) \ +# define OSSL_LIST_FOREACH(p, name, l) \ LIST_FOREACH_FROM(p, name, ossl_list_##name##_head(l)) # define LIST_FOREACH_REV_FROM(p, name, init) \ diff --git a/ssl/quic/quic_engine.c b/ssl/quic/quic_engine.c index 3bcb5d6810d34e..f0724f240e3311 100644 --- a/ssl/quic/quic_engine.c +++ b/ssl/quic/quic_engine.c @@ -131,7 +131,7 @@ static void qeng_tick(QUIC_TICK_RESULT *res, void *arg, uint32_t flags) return; /* Iterate through all ports and service them. */ - LIST_FOREACH(port, port, &qeng->port_list) { + OSSL_LIST_FOREACH(port, port, &qeng->port_list) { QUIC_TICK_RESULT subr = {0}; ossl_quic_port_subtick(port, &subr, flags); diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c index c8cdc668989277..87c0ac0ca6c8fc 100644 --- a/ssl/quic/quic_port.c +++ b/ssl/quic/quic_port.c @@ -273,7 +273,7 @@ int ossl_quic_port_set_net_wbio(QUIC_PORT *port, BIO *net_wbio) if (!port_update_poll_desc(port, net_wbio, /*for_write=*/1)) return 0; - LIST_FOREACH(ch, ch, &port->channel_list) + OSSL_LIST_FOREACH(ch, ch, &port->channel_list) ossl_qtx_set_bio(ch->qtx, net_wbio); port->net_wbio = net_wbio; @@ -373,7 +373,7 @@ void ossl_quic_port_subtick(QUIC_PORT *port, QUIC_TICK_RESULT *res, port_rx_pre(port); /* Iterate through all channels and service them. */ - LIST_FOREACH(ch, ch, &port->channel_list) { + OSSL_LIST_FOREACH(ch, ch, &port->channel_list) { QUIC_TICK_RESULT subr = {0}; ossl_quic_channel_subtick(ch, &subr, flags); @@ -603,7 +603,7 @@ void ossl_quic_port_raise_net_error(QUIC_PORT *port, if (triggering_ch != NULL) ossl_quic_channel_raise_net_error(triggering_ch); - LIST_FOREACH(ch, ch, &port->channel_list) + OSSL_LIST_FOREACH(ch, ch, &port->channel_list) if (ch != triggering_ch) ossl_quic_channel_raise_net_error(ch); }