Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin

2011-04-12 14:22:12 -04:00
parent 2e8b33824f 8bb5edc1c9
commit 79706a8e48
30 changed files with 362 additions and 32 deletions
--- 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
+