Skip to content

Commit a0489f3

Browse files
committed
Merge #20221: net: compat.h related cleanup
cadb77a net: Add compat.h header for htonl function (Hennadii Stepanov) f796f00 net: Drop unneeded headers when compat.h included (Hennadii Stepanov) 467c346 net: Drop unneeded Windows headers in compat.h (Hennadii Stepanov) Pull request description: It is the `compat.h` header's job to provide platform-agnostic interfaces for internet operations. No need in `#include <arpa/inet.h>` scattered around. ACKs for top commit: practicalswift: re-ACK cadb77a: patch looks even better laanwj: Code review ACK cadb77a Tree-SHA512: 625ff90b2806310ab856a6ca1ddb6d9a85aa70f342b323e8525a711dd12219a1ecec8373ec1dca5a0653ffb11f9b421753887b25615d991ba3132c1cca6a3c6e
2 parents 3fa6a9f + cadb77a commit a0489f3

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

src/compat.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
#undef FD_SETSIZE // prevent redefinition compiler warning
1919
#endif
2020
#define FD_SETSIZE 1024 // max number of fds in fd_set
21-
22-
#include <winsock2.h> // Must be included before mswsock.h and windows.h
23-
24-
#include <mswsock.h>
25-
#include <windows.h>
21+
#include <winsock2.h>
2622
#include <ws2tcpip.h>
2723
#include <stdint.h>
2824
#else

src/httpserver.cpp

-7
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@
3333

3434
#include <support/events.h>
3535

36-
#ifdef EVENT__HAVE_NETINET_IN_H
37-
#include <netinet/in.h>
38-
#ifdef _XOPEN_SOURCE_EXTENDED
39-
#include <arpa/inet.h>
40-
#endif
41-
#endif
42-
4336
/** Maximum size of http request (request line + headers) */
4437
static const size_t MAX_HEADERS_SIZE = 8192;
4538

src/net.h

-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
#include <memory>
3434
#include <condition_variable>
3535

36-
#ifndef WIN32
37-
#include <arpa/inet.h>
38-
#endif
39-
40-
4136
class CScheduler;
4237
class CNode;
4338
class BanMan;

src/torcontrol.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <chainparams.h>
99
#include <chainparamsbase.h>
10+
#include <compat.h>
1011
#include <crypto/hmac_sha256.h>
1112
#include <net.h>
1213
#include <netaddress.h>

0 commit comments

Comments
 (0)