aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorSatoshi Nakamoto <satoshin@gmx.com>2010-07-26 17:44:51 +0000
committerGavin Andresen <gavinandresen@gmail.com>2010-07-26 17:44:51 +0000
commitb6dc3b517b74ef2baa0e707f837a65b4ff5a6f2e (patch)
tree757fa9f209b9cb6a42c6b6e6df9e58cad074cd03 /main.cpp
parentf0c11b1917009f1648eb42f1d17f35196fb7c539 (diff)
downloadbitcoin-b6dc3b517b74ef2baa0e707f837a65b4ff5a6f2e.tar.xz
bitcoind now compiles without wxWidgets or wxBase
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 45ad06f936..791836c453 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;