Skip to content

Standardize root folder sources include paths. #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 2 commits into from
Jan 20, 2026
Merged

Standardize root folder sources include paths. #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cded151
Standardize root folder sources include paths.
evoskuil Jan 19, 2026
4704cd0
Move include/bitcoin/ssl to include/bitcoin/network/ssl.
evoskuil Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builds/msvc/vs2022/libbitcoin-network.import.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

<!-- Prevent boost from seeing ssl includes when ssl is deselected (requires external headers). -->
<AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\network\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-ssl)' == 'true'">WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down
9 changes: 2 additions & 7 deletions include/bitcoin/server/define.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef LIBBITCOIN_SERVER_DEFINE_HPP
#define LIBBITCOIN_SERVER_DEFINE_HPP

/// Pulls in common /server headers (excluding settings/config/parser/server_node).
#include <bitcoin/node.hpp>
#include <bitcoin/server/error.hpp>

/// Now we use the generic helper definitions above to define BCS_API
Expand All @@ -37,9 +37,6 @@
#define BCS_INTERNAL BC_HELPER_DLL_LOCAL
#endif

/// For common types below.
#include <bitcoin/node.hpp>

/// Augment limited xcode placeholder defines (10 vs. common 20).
/// ---------------------------------------------------------------------------
#if defined (HAVE_XCODE)
Expand Down Expand Up @@ -79,9 +76,7 @@ namespace std::placeholders

// version : <generated>
// error : version
// events : error
// chase : events
// define : chase
// define : error

// Other directory common includes are not internally chained.
// Each header includes only its required common headers.
Expand Down
1 change: 1 addition & 0 deletions src/configuration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
#include <bitcoin/server/configuration.hpp>

#include <bitcoin/server/define.hpp>
#include <bitcoin/server/settings.hpp>

namespace libbitcoin {
Expand Down
2 changes: 1 addition & 1 deletion src/error.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
#include <bitcoin/server/error.hpp>

#include <bitcoin/system.hpp>
#include <bitcoin/server/define.hpp>

namespace libbitcoin {
namespace server {
Expand Down
1 change: 1 addition & 0 deletions src/parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include <filesystem>
#include <bitcoin/server/configuration.hpp>
#include <bitcoin/server/define.hpp>
#include <bitcoin/server/settings.hpp>

#define BC_HTTP_SERVER_NAME "libbitcoin/4.0"
Expand Down
1 change: 1 addition & 0 deletions src/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include <algorithm>
#include <filesystem>
#include <bitcoin/server/define.hpp>

using namespace bc::system;
using namespace bc::network;
Expand Down
Loading