aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorJeff Garzik <[email protected]>2011-05-12 17:36:42 -0400
committerJeff Garzik <[email protected]>2011-05-12 17:36:42 -0400
commit73eb306cfd2fdc163e12a15abd496986436fcb07 (patch)
treeca8651eb2d0a495fe7e44e39a06f27b0a4e99915 /src/main.cpp
parentMerge pull request #192 from sipa/dnslookup (diff)
parentAdd #ifdef USE_UPNP around usage of fUseUPnP to fix build failure. (diff)
downloaddiscoin-73eb306cfd2fdc163e12a15abd496986436fcb07.tar.xz
discoin-73eb306cfd2fdc163e12a15abd496986436fcb07.zip
Merge branch 'fUseUPnPfix' of https://github.com/TheBlueMatt/bitcoin into tmp
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8d7640f64..4f9ceac5a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -65,13 +65,11 @@ int fLimitProcessors = false;
int nLimitProcessors = 1;
int fMinimizeToTray = true;
int fMinimizeOnClose = true;
-#ifdef USE_UPNP
#if USE_UPNP
int fUseUPnP = true;
#else
int fUseUPnP = false;
#endif
-#endif