diff options
| author | anonimal <anonimal@i2pmail.org> | 2018-04-21 09:30:55 +0000 |
|---|---|---|
| committer | anonimal <anonimal@i2pmail.org> | 2018-04-21 09:43:23 +0000 |
| commit | 6b8539803184eebbf6bb7aef499ac0f5f242901d (patch) | |
| tree | feabede3ade953aeb54d48f7588029ff28573915 /src | |
| parent | CMake: update new location of in-tree miniupnpc (diff) | |
| download | monero-6b8539803184eebbf6bb7aef499ac0f5f242901d.tar.xz | |
Build: update CMake and p2p for in-tree miniupnp
(cherry picked from commit a7366b5feeffaeb65b217b2d6f138e0ab1c90192)
Diffstat (limited to 'src')
| -rw-r--r-- | src/p2p/net_node.inl | 13 |
1 files changed, 3 insertions, 10 deletions
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" |