aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_protocol
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-08-07 15:13:07 +0200
committerRiccardo Spagni <ric@spagni.net>2017-08-07 15:13:07 +0200
commitea46a5527a26eab8dbf664396c8186031b7d50b3 (patch)
tree89bdc857790b852a1a3964292a69dd77de310c0a /src/cryptonote_protocol
parentMerge pull request #2230 (diff)
parentsome include cleanup (diff)
downloadmonero-ea46a5527a26eab8dbf664396c8186031b7d50b3.tar.xz
Merge pull request #2234
214fd81e some include cleanup (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_protocol')
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp10
-rw-r--r--src/cryptonote_protocol/cryptonote_protocol_handler.inl2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp b/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
index e31276031..cb4ec41af 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
@@ -49,8 +49,8 @@
#include "syncobj.h"
-#include "../../contrib/epee/include/net/net_utils_base.h"
-#include "../../contrib/epee/include/misc_log_ex.h"
+#include "net/net_utils_base.h"
+#include "misc_log_ex.h"
#include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/uuid/random_generator.hpp>
@@ -69,10 +69,10 @@
#include <boost/asio/basic_socket.hpp>
#include <boost/asio/ip/unicast.hpp>
-#include "../../src/cryptonote_protocol/cryptonote_protocol_handler.h"
-#include "../../src/p2p/network_throttle.hpp"
+#include "cryptonote_protocol_handler.h"
+#include "p2p/network_throttle.hpp"
-#include "../../../src/cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()
+#include "cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.cn"
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 3dfe86fe1..edf041f48 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -41,7 +41,7 @@
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "profile_tools.h"
-#include "../../src/p2p/network_throttle-detail.hpp"
+#include "p2p/network_throttle-detail.hpp"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.cn"