Browse Source

Rename scriptutils.o to wallet_ismine.o

pull/145/head
jtimon 10 years ago
committed by Wladimir J. van der Laan
parent
commit
c1e433b717
  1. 4
      src/Makefile.am
  2. 2
      src/test/multisig_tests.cpp
  3. 2
      src/test/script_P2SH_tests.cpp
  4. 2
      src/wallet.h
  5. 2
      src/wallet_ismine.cpp
  6. 4
      src/wallet_ismine.h

4
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)

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

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

2
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"

2
src/scriptutils.cpp → 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"

4
src/scriptutils.h → 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"
Loading…
Cancel
Save