diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-04-21 22:01:54 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-04-21 22:01:54 +0200 |
| commit | 8fdf645397654956b74d6ddcd79f94bfa7bf2c5f (patch) | |
| tree | 507f8764f20cd3254f5a411e6619e24fd12489bd /src | |
| parent | Merge pull request #3579 (diff) | |
| parent | Build: remove UPnP definition from snap (diff) | |
| download | monero-8fdf645397654956b74d6ddcd79f94bfa7bf2c5f.tar.xz | |
Merge pull request #3670
19e01378 Build: remove UPnP definition from snap (anonimal)
6b853980 Build: update CMake and p2p for in-tree miniupnp (anonimal)
859db52f CMake: update new location of in-tree miniupnpc (anonimal)
f21df05c Build: add miniupnp submodule (anonimal)
10685648 Build: remove in-tree miniupnpc (anonimal)
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 3b0d1c394..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 <miniupnpc/miniupnpc.h> - #include <miniupnpc/upnpcommands.h> - #include <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" |