Merge bitcoin/bitcoin#27530: Remove now-unnecessary poll, fcntl includes from net(base).cpp

8d9b90a61e3a2a451abfce25328d13aa1e8f749b Remove now-unnecessary poll, fcntl includes from net(base).cpp (Ben Woosley)

Pull request description:

  As far as I can tell, the code calling for these includes was removed in:
  6e68ccbefea6509c61fc4405a391a517c6057bb0 #24356
  82d360b5a88d9057b6c09b61cd69e426c7a2412d #21387

ACKs for top commit:
  fanquake:
    ACK 8d9b90a61e3a2a451abfce25328d13aa1e8f749b

Tree-SHA512: e536d60f4cf204a10a5b461eca20c8329aa6b0fd3b27651ac9490ed42d3e22e31d652cd991ddc84c96e4758df15aefa7e7f84c710f2feb6d2e0fcfbda9ad4356
This commit is contained in:
fanquake 2023-06-29 10:27:31 +01:00
commit e0cd7458e6
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
2 changed files with 0 additions and 14 deletions

View File

@ -37,18 +37,12 @@
#ifdef WIN32
#include <string.h>
#else
#include <fcntl.h>
#endif
#if HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS
#include <ifaddrs.h>
#endif
#ifdef USE_POLL
#include <poll.h>
#endif
#include <algorithm>
#include <array>
#include <cstdint>

View File

@ -21,14 +21,6 @@
#include <limits>
#include <memory>
#ifndef WIN32
#include <fcntl.h>
#endif
#ifdef USE_POLL
#include <poll.h>
#endif
// Settings
static GlobalMutex g_proxyinfo_mutex;
static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex);