diff options
| author | jtimon <jtimon@blockstream.io> | 2014-08-30 13:40:37 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-09-10 12:48:35 +0200 |
| commit | c1e433b717fbc26a74ca395771076b203630a5a2 (patch) | |
| tree | c1c551df9c68b5c75d62629cd2554e661b3df113 /src | |
| parent | 8b59a3d36626085db79db2874ae76272b2b42f25 (diff) | |
| download | bitcoin-c1e433b717fbc26a74ca395771076b203630a5a2.tar.xz | |
Rename scriptutils.o to wallet_ismine.o
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/test/multisig_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/script_P2SH_tests.cpp | 2 | ||||
| -rw-r--r-- | src/wallet.h | 2 | ||||
| -rw-r--r-- | src/wallet_ismine.cpp (renamed from src/scriptutils.cpp) | 2 | ||||
| -rw-r--r-- | src/wallet_ismine.h (renamed from src/scriptutils.h) | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 27bcdc7bcc..b2071f49e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,7 +103,7 @@ BITCOIN_CORE_H = \ script/script.h \ script/sign.h \ script/standard.h \ - scriptutils.h \ + wallet_ismine.h \ serialize.h \ sync.h \ threadsafety.h \ @@ -173,7 +173,7 @@ libbitcoin_wallet_a_SOURCES = \ crypter.cpp \ rpcdump.cpp \ rpcwallet.cpp \ - scriptutils.cpp \ + wallet_ismine.cpp \ wallet.cpp \ walletdb.cpp \ $(BITCOIN_CORE_H) diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 427477edcc..91dfa39505 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -11,7 +11,7 @@ #include "uint256.h" #ifdef ENABLE_WALLET -#include "scriptutils.h" +#include "wallet_ismine.h" #endif #include <boost/assign/std/vector.hpp> diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index b1c1052de4..f99002017f 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -9,7 +9,7 @@ #include "script/sign.h" #ifdef ENABLE_WALLET -#include "scriptutils.h" +#include "wallet_ismine.h" #endif #include <vector> diff --git a/src/wallet.h b/src/wallet.h index 6788986f88..5c26186730 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -11,7 +11,7 @@ #include "key.h" #include "keystore.h" #include "main.h" -#include "scriptutils.h" +#include "wallet_ismine.h" #include "ui_interface.h" #include "walletdb.h" diff --git a/src/scriptutils.cpp b/src/wallet_ismine.cpp index 5099d7515a..1c2c117fad 100644 --- a/src/scriptutils.cpp +++ b/src/wallet_ismine.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 "scriptutils.h" +#include "wallet_ismine.h" #include "key.h" #include "keystore.h" diff --git a/src/scriptutils.h b/src/wallet_ismine.h index 4e98a1f74f..9915e9f7bb 100644 --- a/src/scriptutils.h +++ b/src/wallet_ismine.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 H_BITCOIN_SCRIPTUTILS -#define H_BITCOIN_SCRIPTUTILS +#ifndef H_BITCOIN_WALLET_ISMINE +#define H_BITCOIN_WALLET_ISMINE #include "key.h" #include "script/script.h" |