From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Saj6wJZO; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTPS id D3E305A0619 for ; Fri, 10 Oct 2025 10:46:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760086015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaX6z1xyGT/uP0LiHrwAsHKvMSXCS1YUqgWOx0VrcPY=; b=Saj6wJZOjrxQglgibBUUqtO5G4pYCOrQuKJDwAvhlGNDhV/6NiX13ThsNwbCoqpJ5h/xLy OjxZTkWPSeE+70cUvcL7QETaUr5+xk+cepgfyzmJQXFD9DvWLDLDHztNSYD7no3y/1cQ3Y EmP8pQbAk3QOLzxTZ08dGV73VMt/Fbk= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-582-yHpDF_FSOj22zlYC8dub0w-1; Fri, 10 Oct 2025 04:46:54 -0400 X-MC-Unique: yHpDF_FSOj22zlYC8dub0w-1 X-Mimecast-MFC-AGG-ID: yHpDF_FSOj22zlYC8dub0w_1760086013 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B47A7180034F for ; Fri, 10 Oct 2025 08:46:53 +0000 (UTC) Received: from lenovo-t14s.redhat.com (unknown [10.45.224.166]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A00431955F22; Fri, 10 Oct 2025 08:46:52 +0000 (UTC) From: Laurent Vivier To: passt-dev@passt.top Subject: [PATCH v2] passt: Rename EPOLL_EVENTS to NUM_EPOLL_EVENTS Date: Fri, 10 Oct 2025 10:46:51 +0200 Message-ID: <20251010084651.1426628-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: sNe-19IGwhxtBogFAaHx8njylbV5UuStDp4kFb7xTzU_1760086013 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true Message-ID-Hash: CTGHA43ZGG6EC5M4D2KJRJGQAACOTHFZ X-Message-ID-Hash: CTGHA43ZGG6EC5M4D2KJRJGQAACOTHFZ X-MailFrom: lvivier@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Laurent Vivier X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The macro EPOLL_EVENTS conflicts with enum EPOLL_EVENTS defined in sys/epoll.h (glibc). Rename the local macro to NUM_EPOLL_EVENTS to avoid this namespace collision. Signed-off-by: Laurent Vivier --- Notes: v2: Rename PASST_EPOLL_EVENTS to NUM_EPOLL_EVENTS for better clarity passt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/passt.c b/passt.c index 31fbb75b1b12..bdb7b6935f0c 100644 --- a/passt.c +++ b/passt.c @@ -54,7 +54,7 @@ #include "migrate.h" #include "repair.h" -#define EPOLL_EVENTS 8 +#define NUM_EPOLL_EVENTS 8 #define TIMER_INTERVAL__ MIN(TCP_TIMER_INTERVAL, UDP_TIMER_INTERVAL) #define TIMER_INTERVAL_ MIN(TIMER_INTERVAL__, ICMP_TIMER_INTERVAL) @@ -245,7 +245,7 @@ static void print_stats(const struct ctx *c, const struct passt_stats *stats, */ int main(int argc, char **argv) { - struct epoll_event events[EPOLL_EVENTS]; + struct epoll_event events[NUM_EPOLL_EVENTS]; struct passt_stats stats = { 0 }; int nfds, i, devnull_fd = -1; struct ctx c = { 0 }; @@ -349,7 +349,7 @@ int main(int argc, char **argv) loop: /* NOLINTBEGIN(bugprone-branch-clone): intervals can be the same */ /* cppcheck-suppress [duplicateValueTernary, unmatchedSuppression] */ - nfds = epoll_wait(c.epollfd, events, EPOLL_EVENTS, TIMER_INTERVAL); + nfds = epoll_wait(c.epollfd, events, NUM_EPOLL_EVENTS, TIMER_INTERVAL); /* NOLINTEND(bugprone-branch-clone) */ if (nfds == -1 && errno != EINTR) die_perror("epoll_wait() failed in main loop"); -- 2.50.1