aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am4
-rw-r--r--src/chain.h2
-rw-r--r--src/chainparams.h2
-rw-r--r--src/core/block.cpp (renamed from src/core.cpp)2
-rw-r--r--src/core/block.h (renamed from src/core.h)6
-rw-r--r--src/main.h2
-rw-r--r--src/miner.cpp2
-rw-r--r--src/pow.cpp2
-rw-r--r--src/wallet.h2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 0385ad9025..4ca75d6a77 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,7 +81,7 @@ BITCOIN_CORE_H = \
coins.h \
compat.h \
compressor.h \
- core.h \
+ core/block.h \
core/transaction.h \
core_io.h \
crypter.h \
@@ -215,7 +215,7 @@ libbitcoin_common_a_SOURCES = \
chainparams.cpp \
coins.cpp \
compressor.cpp \
- core.cpp \
+ core/block.cpp \
core/transaction.cpp \
core_read.cpp \
core_write.cpp \
diff --git a/src/chain.h b/src/chain.h
index 290150476e..2a55771622 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -6,7 +6,7 @@
#ifndef H_BITCOIN_CHAIN
#define H_BITCOIN_CHAIN
-#include "core.h"
+#include "core/block.h"
#include "pow.h"
#include "tinyformat.h"
#include "uint256.h"
diff --git a/src/chainparams.h b/src/chainparams.h
index f157419bb2..e27728dbd5 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -6,9 +6,9 @@
#ifndef BITCOIN_CHAIN_PARAMS_H
#define BITCOIN_CHAIN_PARAMS_H
-#include "core.h"
#include "chainparamsbase.h"
#include "checkpoints.h"
+#include "core/block.h"
#include "protocol.h"
#include "uint256.h"
diff --git a/src/core.cpp b/src/core/block.cpp
index 08139d5424..2010d44dac 100644
--- a/src/core.cpp
+++ b/src/core/block.cpp
@@ -3,7 +3,7 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#include "core.h"
+#include "core/block.h"
#include "hash.h"
#include "tinyformat.h"
diff --git a/src/core.h b/src/core/block.h
index b2288e24ca..f1eb7a844f 100644
--- a/src/core.h
+++ b/src/core/block.h
@@ -3,8 +3,8 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_CORE_H
-#define BITCOIN_CORE_H
+#ifndef H_BITCOIN_CORE_BLOCK
+#define H_BITCOIN_CORE_BLOCK
#include "core/transaction.h"
#include "serialize.h"
@@ -165,4 +165,4 @@ struct CBlockLocator
}
};
-#endif // BITCOIN_CORE_H
+#endif // H_BITCOIN_CORE_BLOCK
diff --git a/src/main.h b/src/main.h
index 09f22471d6..1941ca7059 100644
--- a/src/main.h
+++ b/src/main.h
@@ -14,7 +14,7 @@
#include "chain.h"
#include "chainparams.h"
#include "coins.h"
-#include "core.h"
+#include "core/block.h"
#include "core/transaction.h"
#include "net.h"
#include "pow.h"
diff --git a/src/miner.cpp b/src/miner.cpp
index cf47b65a5c..0235de3ab3 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -6,7 +6,7 @@
#include "miner.h"
#include "amount.h"
-#include "core.h"
+#include "core/block.h"
#include "core/transaction.h"
#include "hash.h"
#include "main.h"
diff --git a/src/pow.cpp b/src/pow.cpp
index 75fbfc6a6d..af7fc488ef 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -6,7 +6,7 @@
#include "pow.h"
#include "chainparams.h"
-#include "core.h"
+#include "core/block.h"
#include "main.h"
#include "timedata.h"
#include "uint256.h"
diff --git a/src/wallet.h b/src/wallet.h
index 4c559cb7b1..acb30970c6 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -7,7 +7,7 @@
#define BITCOIN_WALLET_H
#include "amount.h"
-#include "core.h"
+#include "core/block.h"
#include "core/transaction.h"
#include "crypter.h"
#include "key.h"