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
This commit is contained in:
merge-script 2021-09-16 09:13:18 +02:00 committed by pasta
parent e0d893a11a
commit 808926be7e
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984
2 changed files with 5 additions and 5 deletions

View File

@ -22,8 +22,6 @@
#ifndef WIN32
#include <fcntl.h>
#else
#include <codecvt>
#endif
#ifdef USE_POLL

View File

@ -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