mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
Merge pull request #3235 from Diapolo/misc
misc small changes to polish after include cleanup
This commit is contained in:
commit
309f783fce
@ -1,6 +1,7 @@
|
|||||||
//
|
// Copyright (c) 2010 Satoshi Nakamoto
|
||||||
// Alert system
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
||||||
//
|
// Distributed under the MIT/X11 software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#include "alert.h"
|
#include "alert.h"
|
||||||
|
|
||||||
|
@ -3,8 +3,6 @@
|
|||||||
// Distributed under the MIT/X11 software license, see the accompanying
|
// Distributed under the MIT/X11 software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "bitcoinrpc.h"
|
#include "bitcoinrpc.h"
|
||||||
#include "init.h"
|
#include "init.h"
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//#include <boost/array.hpp>
|
|
||||||
#include <boost/foreach.hpp>
|
#include <boost/foreach.hpp>
|
||||||
#include <boost/signals2/signal.hpp>
|
#include <boost/signals2/signal.hpp>
|
||||||
#include <openssl/rand.h>
|
#include <openssl/rand.h>
|
||||||
|
@ -130,7 +130,6 @@ Value importwallet(const Array& params, bool fHelp)
|
|||||||
|
|
||||||
int64_t nTimeBegin = chainActive.Tip()->nTime;
|
int64_t nTimeBegin = chainActive.Tip()->nTime;
|
||||||
|
|
||||||
|
|
||||||
bool fGood = true;
|
bool fGood = true;
|
||||||
|
|
||||||
while (file.good()) {
|
while (file.good()) {
|
||||||
|
@ -3,8 +3,6 @@
|
|||||||
// Distributed under the MIT/X11 software license, see the accompanying
|
// Distributed under the MIT/X11 software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "bitcoinrpc.h"
|
#include "bitcoinrpc.h"
|
||||||
#include "chainparams.h"
|
#include "chainparams.h"
|
||||||
#include "db.h"
|
#include "db.h"
|
||||||
|
@ -27,8 +27,6 @@
|
|||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#else
|
|
||||||
typedef int pid_t; /* define for Windows compatibility */
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <boost/filesystem/path.hpp>
|
#include <boost/filesystem/path.hpp>
|
||||||
@ -109,7 +107,7 @@ inline void MilliSleep(int64_t n)
|
|||||||
#elif defined(HAVE_WORKING_BOOST_SLEEP)
|
#elif defined(HAVE_WORKING_BOOST_SLEEP)
|
||||||
boost::this_thread::sleep(boost::posix_time::milliseconds(n));
|
boost::this_thread::sleep(boost::posix_time::milliseconds(n));
|
||||||
#else
|
#else
|
||||||
//should never get here
|
//should never get here
|
||||||
#error missing boost sleep implementation
|
#error missing boost sleep implementation
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user