sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #20221: net: compat.h related cleanup

Browse Source 
cadb77a6ab8a3e6f56062cfaec4dd8168c71b39d net: Add compat.h header for htonl function (Hennadii Stepanov)
f796f0057bc7dad8e7065831b07f432fc0fb9f08 net: Drop unneeded headers when compat.h included (Hennadii Stepanov)
467c34644861a5267601255650e27c7aadab31dc 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 cadb77a6ab8a3e6f56062cfaec4dd8168c71b39d: patch looks even better
  laanwj:
    Code review ACK cadb77a6ab8a3e6f56062cfaec4dd8168c71b39d

Tree-SHA512: 625ff90b2806310ab856a6ca1ddb6d9a85aa70f342b323e8525a711dd12219a1ecec8373ec1dca5a0653ffb11f9b421753887b25615d991ba3132c1cca6a3c6e
This commit is contained in:
Wladimir J. van der Laan 2020-12-03 14:52:23 +01:00 committed by PastaPastaPasta
parent de28a0e10c
commit 84b8d62d34
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compat.h
View File

@ -21,11 +21,7 @@
#undef FD_SETSIZE // prevent redefinition compiler warning #undef FD_SETSIZE // prevent redefinition compiler warning
#endif #endif
#define FD_SETSIZE 1024 // max number of fds in fd_set #define FD_SETSIZE 1024 // max number of fds in fd_set
#include <winsock2.h>
#include <winsock2.h> // Must be included before mswsock.h and windows.h
#include <mswsock.h>
#include <windows.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <stdint.h> #include <stdint.h>
#else #else

7
src/httpserver.cpp
View File

@ -29,13 +29,6 @@
#include <support/events.h> #include <support/events.h>
#ifdef EVENT__HAVE_NETINET_IN_H
#include <netinet/in.h>
#ifdef _XOPEN_SOURCE_EXTENDED
#include <arpa/inet.h>
#endif
#endif
#include <thread> #include <thread>
#include <condition_variable> #include <condition_variable>

5
src/net.h
View File

@ -40,11 +40,6 @@
#include <optional> #include <optional>
#include <queue> #include <queue>
#ifndef WIN32
#include <arpa/inet.h>
#endif
#ifndef WIN32 #ifndef WIN32
#define USE_WAKEUP_PIPE #define USE_WAKEUP_PIPE
#endif #endif

1
src/torcontrol.cpp
View File

@ -7,6 +7,7 @@
#include <chainparams.h> #include <chainparams.h>
#include <chainparamsbase.h> #include <chainparamsbase.h>
#include <compat.h>
#include <crypto/hmac_sha256.h> #include <crypto/hmac_sha256.h>
#include <net.h> #include <net.h>
#include <netaddress.h> #include <netaddress.h>