diff options
| author | Alex <alex> | 2012-10-22 08:37:17 -0400 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2012-11-12 22:05:15 +0000 |
| commit | 71f7ccf1ec625a7203b47eb7fcb830034d82b627 (patch) | |
| tree | a3650203e3baa30cbd1a51a9aec73175d1f35260 /src | |
| parent | Merge branch '0.5.x' into 0.6.0.x (diff) | |
| download | discoin-71f7ccf1ec625a7203b47eb7fcb830034d82b627.tar.xz discoin-71f7ccf1ec625a7203b47eb7fcb830034d82b627.zip | |
Fixed 100% CPU utilization problem on FreeBSD 9
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 4 | ||||
| -rw-r--r-- | src/qt/qtipcserver.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 836b9f603..d71073324 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -148,7 +148,7 @@ static void handleRunawayException(std::exception *e) #ifndef BITCOIN_QT_TEST int main(int argc, char *argv[]) { -#if !defined(MAC_OSX) && !defined(WIN32) +#if !defined(MAC_OSX) && !defined(WIN32) && !defined(__FreeBSD__) // TODO: implement qtipcserver.cpp for Mac and Windows // Do this early as we don't want to bother initializing if we are just calling IPC @@ -275,7 +275,7 @@ int main(int argc, char *argv[]) // Place this here as guiref has to be defined if we don't want to lose URIs ipcInit(); -#if !defined(MAC_OSX) && !defined(WIN32) +#if !defined(MAC_OSX) && !defined(WIN32) && !defined(__FreeBSD__) // TODO: implement qtipcserver.cpp for Mac and Windows // Check for URI in argv diff --git a/src/qt/qtipcserver.cpp b/src/qt/qtipcserver.cpp index 3c7889ca7..f1ad2b75a 100644 --- a/src/qt/qtipcserver.cpp +++ b/src/qt/qtipcserver.cpp @@ -45,7 +45,7 @@ void ipcThread(void* parg) void ipcInit() { -#ifdef MAC_OSX +#if defined(MAC_OSX) || defined(__FreeBSD__) // TODO: implement bitcoin: URI handling the Mac Way return; #endif |