From 6b8539803184eebbf6bb7aef499ac0f5f242901d Mon Sep 17 00:00:00 2001
From: anonimal <anonimal@i2pmail.org>
Date: Sat, 21 Apr 2018 09:30:55 +0000
Subject: Build: update CMake and p2p for in-tree miniupnp

(cherry picked from commit a7366b5feeffaeb65b217b2d6f138e0ab1c90192)
---
 src/p2p/net_node.inl | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 76340a22b..9b21705ec 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -49,16 +49,9 @@
 #include "storages/levin_abstract_invoke2.h"
 #include "cryptonote_core/cryptonote_core.h"
 
-// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-#ifdef UPNP_STATIC
-  #include <miniupnp/miniupnpc/miniupnpc.h>
-  #include <miniupnp/miniupnpc/upnpcommands.h>
-  #include <miniupnp/miniupnpc/upnperrors.h>
-#else
-  #include "miniupnpc.h"
-  #include "upnpcommands.h"
-  #include "upnperrors.h"
-#endif
+#include <miniupnp/miniupnpc/miniupnpc.h>
+#include <miniupnp/miniupnpc/upnpcommands.h>
+#include <miniupnp/miniupnpc/upnperrors.h>
 
 #undef MONERO_DEFAULT_LOG_CATEGORY
 #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
-- 
cgit v1.2.3