From 0df0aa74bebc2a11fca3a96978109d6e743663e3 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 12 Oct 2022 14:19:09 +0000 Subject: [PATCH] tidy-up: delete unused HAVE_STRUCT_POLLFD It was only defined in `lib/config-win32.h`, when building for Vista. It was only used in `select.h`, in a condition that also included a check for `POLLIN` which is a superior choice for this detection and which was already used by cmake and autotools builds. Delete both instances of this macro. Closes #9707 --- lib/config-win32.h | 5 ----- lib/select.h | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/config-win32.h b/lib/config-win32.h index ea05efff1a..2f7c41644b 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -511,11 +511,6 @@ Vista /* Define if struct sockaddr_in6 has the sin6_scope_id member. */ #define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1 -#if defined(HAVE_WINSOCK2_H) && defined(_WIN32_WINNT) && \ - (_WIN32_WINNT >= 0x0600) -#define HAVE_STRUCT_POLLFD 1 -#endif - /* ---------------------------------------------------------------- */ /* LARGE FILE SUPPORT */ /* ---------------------------------------------------------------- */ diff --git a/lib/select.h b/lib/select.h index eaff7d9b1c..f2cf8bbd9f 100644 --- a/lib/select.h +++ b/lib/select.h @@ -36,8 +36,7 @@ * Definition of pollfd struct and constants for platforms lacking them. */ -#if !defined(HAVE_STRUCT_POLLFD) && \ - !defined(HAVE_SYS_POLL_H) && \ +#if !defined(HAVE_SYS_POLL_H) && \ !defined(HAVE_POLL_H) && \ !defined(POLLIN) -- 2.47.3