diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:26:56 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-11-14 21:26:56 +0000 |
| commit | f1a9aad7893173b0351ad32e684dad6f31598210 (patch) | |
| tree | 21373860cc7f22da72e28d97263813f53e450920 /src/qt/bitcoin.cpp | |
| parent | 8b11b682f14f20cf2935c4a5abb4dbd3d508e46e (diff) | |
| parent | 8045273a015cc72857ca168b0ad224b3acbbaf8a (diff) | |
Merge branch '0.6.0.x' into 0.6.x
Conflicts:
src/init.cpp
src/main.cpp
src/serialize.h
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 5acfd1ca74..1e7c582684 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -134,7 +134,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 @@ -264,7 +264,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 |