Skip to content

Commit ec7ec69

Browse files
author
merge-script
committed
Merge bitcoin/bitcoin#22952: Cleanup headers after #20788
3174425 Cleanup headers after #20788 (Hennadii Stepanov) Pull request description: This is a header cleanup after #20788. ACKs for top commit: vasild: ACK 3174425 Tree-SHA512: 1c21b1ba43841880625289174f10e5b333f6eb857f448e1e4114b1ecdf32a6044ec91c5987c1d66806c1d408a4e3d46569eb41d69a0acb8296601d7c203d9f1d
2 parents 9424e78 + 3174425 commit ec7ec69

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/netbase.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
#ifndef WIN32
2525
#include <fcntl.h>
26-
#else
27-
#include <codecvt>
2826
#endif
2927

3028
#ifdef USE_POLL

src/util/sock.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
#include <util/system.h>
1111
#include <util/time.h>
1212

13-
#include <codecvt>
14-
#include <cwchar>
15-
#include <locale>
1613
#include <stdexcept>
1714
#include <string>
1815

16+
#ifdef WIN32
17+
#include <codecvt>
18+
#include <locale>
19+
#endif
20+
1921
#ifdef USE_POLL
2022
#include <poll.h>
2123
#endif

0 commit comments

Comments
 (0)