aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-04-12 14:22:12 -0400
committerGavin Andresen <[email protected]>2011-04-12 14:22:12 -0400
commit79706a8e48a043b9ca83216ba9cbb7413e81710d (patch)
tree8da44bcaca6b7a3ce02c589957da284ac8adf9dd /main.cpp
parentMerge branch 'spentpertxout' of https://github.com/sipa/bitcoin (diff)
parentAllow UPnP mapping when USE_UPNP is defined and miniupnpc is installed at bui... (diff)
downloaddiscoin-79706a8e48a043b9ca83216ba9cbb7413e81710d.tar.xz
discoin-79706a8e48a043b9ca83216ba9cbb7413e81710d.zip
Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/main.cpp b/main.cpp
index d5ab1edc7..17a1b81c5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -65,6 +65,14 @@ 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
+