Merge pull request #962 from evoskuil/master

Standardize root folder sources include paths.

Author: evoskuil

builds/msvc/vs2022/libbitcoin-network.import.props

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

include/bitcoin/node/events.hpp

@@ -19,7 +19,6 @@
 #ifndef LIBBITCOIN_NODE_EVENTS_HPP
 #define LIBBITCOIN_NODE_EVENTS_HPP
 
-#include <bitcoin/system.hpp>
 #include <bitcoin/node/error.hpp>
 
 namespace libbitcoin {

src/block_arena.cpp

@@ -19,7 +19,7 @@
 #include <bitcoin/node/block_arena.hpp>
 
 #include <algorithm>
-#include <bitcoin/system.hpp>
+#include <bitcoin/node/define.hpp>
 
 namespace libbitcoin {
 namespace node {

src/block_memory.cpp

@@ -19,6 +19,7 @@
 #include <bitcoin/node/block_memory.hpp>
 
 #include <atomic>
+#include <bitcoin/node/define.hpp>
 
 namespace libbitcoin {
 namespace node {

src/configuration.cpp

@@ -18,6 +18,7 @@
  */
 #include <bitcoin/node/configuration.hpp>
 
+#include <bitcoin/node/define.hpp>
 #include <bitcoin/node/settings.hpp>
 
 namespace libbitcoin {

src/error.cpp

@@ -18,7 +18,7 @@
  */
 #include <bitcoin/node/error.hpp>
 
-#include <bitcoin/system.hpp>
+#include <bitcoin/node/define.hpp>
 
 namespace libbitcoin {
 namespace node {

src/settings.cpp

@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <filesystem>
+#include <bitcoin/node/define.hpp>
 
 using namespace bc::system;
 using namespace bc::network;