GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 16b5b4b674 into merged_master (Bitcoin PR bitcoin/bitcoin#28579)

Browse source
This commit is contained in:
Byron Hambly 2025-11-11 10:52:33 +02:00
commit 3950e02cd0
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
6 changed files with 10 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/system.cpp
View file

@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2022 The Bitcoin Core developers
// Copyright (c) 2009-present The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -12,6 +12,7 @@
#ifndef WIN32
#include <sys/stat.h>
#else
#include <compat/compat.h>
#include <codecvt>
#endif

8
src/common/system.h
View file

@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
// Copyright (c) 2009-2022 The Bitcoin Core developers
// Copyright (c) 2009-present The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -10,11 +10,7 @@
#include <config/bitcoin-config.h>
#endif
#include <compat/assumptions.h>
#include <compat/compat.h>
#include <set>
#include <stdint.h>
#include <cstdint>
#include <string>
// Application startup time (used for uptime calculation)