aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-07-26 17:15:18 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-07-26 17:15:18 +0000
commit793200e5e918a6e993ddf701967a8b6535a6828f (patch)
treee983c5b11c032a309edb230f8694225aef478d98 /main.cpp
parent6966768a554575ca329fbcd4aad0d4f21c702f9a (diff)
downloadbitcoin-793200e5e918a6e993ddf701967a8b6535a6828f.tar.xz
bitcoind now compiles without wxWidgets or wxBase
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@112 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/main.cpp b/main.cpp
index afa7add573..34ac299945 100644
--- a/main.cpp
+++ b/main.cpp
@@ -83,6 +83,7 @@ bool AddKey(const CKey& key)
vector<unsigned char> GenerateNewKey()
{
+ RandAddSeedPerfmon();
CKey key;
key.MakeNewKey();
if (!AddKey(key))
@@ -1506,7 +1507,7 @@ bool CheckDiskSpace(int64 nAdditionalBytes)
{
fShutdown = true;
printf("*** %s***\n", _("Warning: Disk space is low "));
-#if wxUSE_GUI
+#ifdef GUI
ThreadSafeMessageBox(_("Warning: Disk space is low "), "Bitcoin", wxOK | wxICON_EXCLAMATION);
#endif
CreateThread(Shutdown, NULL);
@@ -2494,7 +2495,7 @@ void GenerateBitcoins(bool fGenerate)
}
if (fGenerateBitcoins)
{
- int nProcessors = wxThread::GetCPUCount();
+ int nProcessors = boost::thread::hardware_concurrency();
printf("%d processors\n", nProcessors);
if (nProcessors < 1)
nProcessors = 1;