aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerge-script <falke.marco@gmail.com>2021-09-16 09:13:18 +0200
committermerge-script <falke.marco@gmail.com>2021-09-16 09:13:18 +0200
commitec7ec69c7bcaea2b301991066a06b183b50ebe11 (patch)
treef323c9ab3117273366d78e157211f86ee623afbb
parent9424e78f34da991de488c2f7c2409a4196f2819a (diff)
parent317442525586ba9ff8b9af6c506b48f87cd8cd87 (diff)
downloadbitcoin-ec7ec69c7bcaea2b301991066a06b183b50ebe11.tar.xz
Merge bitcoin/bitcoin#22952: Cleanup headers after #20788
317442525586ba9ff8b9af6c506b48f87cd8cd87 Cleanup headers after #20788 (Hennadii Stepanov) Pull request description: This is a header cleanup after #20788. ACKs for top commit: vasild: ACK 317442525586ba9ff8b9af6c506b48f87cd8cd87 Tree-SHA512: 1c21b1ba43841880625289174f10e5b333f6eb857f448e1e4114b1ecdf32a6044ec91c5987c1d66806c1d408a4e3d46569eb41d69a0acb8296601d7c203d9f1d
-rw-r--r--src/netbase.cpp2
-rw-r--r--src/util/sock.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 2980bdf459..64d17189a6 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -23,8 +23,6 @@
#ifndef WIN32
#include <fcntl.h>
-#else
-#include <codecvt>
#endif
#ifdef USE_POLL
diff --git a/src/util/sock.cpp b/src/util/sock.cpp
index b6c2a47434..1a4d67a65e 100644
--- a/src/util/sock.cpp
+++ b/src/util/sock.cpp
@@ -10,12 +10,14 @@
#include <util/system.h>
#include <util/time.h>
-#include <codecvt>
-#include <cwchar>
-#include <locale>
#include <stdexcept>
#include <string>
+#ifdef WIN32
+#include <codecvt>
+#include <locale>
+#endif
+
#ifdef USE_POLL
#include <poll.h>
#endif