Merge bitcoin/bitcoin#27530: Remove now-unnecessary poll, fcntl includes from net(base).cpp
8d9b90a61eRemove 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:6e68ccbefe#2435682d360b5a8#21387 ACKs for top commit: fanquake: ACK8d9b90a61eTree-SHA512: e536d60f4cf204a10a5b461eca20c8329aa6b0fd3b27651ac9490ed42d3e22e31d652cd991ddc84c96e4758df15aefa7e7f84c710f2feb6d2e0fcfbda9ad4356
This commit is contained in:
2 files changed
-14
No files matched your search
@@ -37,18 +37,12 @@
|
|||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#else
|
|
||||||
#include <fcntl.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS
|
#if HAVE_DECL_GETIFADDRS && HAVE_DECL_FREEIFADDRS
|
||||||
#include <ifaddrs.h>
|
#include <ifaddrs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_POLL
|
|
||||||
#include <poll.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|||||||
@@ -21,14 +21,6 @@
|
|||||||
#include <limits>
|
#include <limits>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#ifndef WIN32
|
|
||||||
#include <fcntl.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_POLL
|
|
||||||
#include <poll.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Settings
|
// Settings
|
||||||
static GlobalMutex g_proxyinfo_mutex;
|
static GlobalMutex g_proxyinfo_mutex;
|
||||||
static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex);
|
static Proxy proxyInfo[NET_MAX] GUARDED_BY(g_proxyinfo_mutex);
|
||||||
|
|||||||
Reference in new issue
Block a user