Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 11:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflicting qt and libi2pd TunnelConfig.cpp (.o names clash)

Browse source
This commit is contained in:
user 2020-10-28 02:43:04 +08:00
parent c63818f355
commit 3ad1c94966
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/CMakeLists.txt
View file

@ -85,7 +85,7 @@ set(LIBI2PD_SRC
"${LIBI2PD_SRC_DIR}/TunnelEndpoint.cpp" "${LIBI2PD_SRC_DIR}/TunnelEndpoint.cpp"
"${LIBI2PD_SRC_DIR}/TunnelGateway.cpp" "${LIBI2PD_SRC_DIR}/TunnelGateway.cpp"
"${LIBI2PD_SRC_DIR}/TunnelPool.cpp" "${LIBI2PD_SRC_DIR}/TunnelPool.cpp"
"${LIBI2PD_SRC_DIR}/TunnelConfig.cpp" "${LIBI2PD_SRC_DIR}/TunnelHopConfig.cpp"
"${LIBI2PD_SRC_DIR}/util.cpp" "${LIBI2PD_SRC_DIR}/util.cpp"
) )

2
libi2pd/Tunnel.h
View file

@ -20,7 +20,7 @@
#include <memory> #include <memory>
#include "Queue.h" #include "Queue.h"
#include "Crypto.h" #include "Crypto.h"
#include "TunnelConfig.h" #include "TunnelHopConfig.h"
#include "TunnelPool.h" #include "TunnelPool.h"
#include "TransitTunnel.h" #include "TransitTunnel.h"
#include "TunnelEndpoint.h" #include "TunnelEndpoint.h"

4
libi2pd/TunnelConfig.cpp → libi2pd/TunnelHopConfig.cpp
View file

@ -16,7 +16,7 @@
#include "Timestamp.h" #include "Timestamp.h"
#include "I2PEndian.h" #include "I2PEndian.h"
#include "I2NPProtocol.h" #include "I2NPProtocol.h"
#include "TunnelConfig.h" #include "TunnelHopConfig.h"
namespace i2p namespace i2p
{ {
@ -163,4 +163,4 @@ namespace tunnel
SHA256_Final (h, &ctx); SHA256_Final (h, &ctx);
} }
} }
} }

0
libi2pd/TunnelConfig.h → libi2pd/TunnelHopConfig.h
View file

2
qt/i2pd_qt/i2pd_qt.pro
View file

@ -60,7 +60,7 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \
../../libi2pd/TunnelEndpoint.cpp \ ../../libi2pd/TunnelEndpoint.cpp \
../../libi2pd/TunnelGateway.cpp \ ../../libi2pd/TunnelGateway.cpp \
../../libi2pd/TunnelPool.cpp \ ../../libi2pd/TunnelPool.cpp \
../../libi2pd/TunnelConfig.cpp \ ../../libi2pd/TunnelHopConfig.cpp \
../../libi2pd/util.cpp \ ../../libi2pd/util.cpp \
../../libi2pd/Elligator.cpp \ ../../libi2pd/Elligator.cpp \
../../libi2pd/ECIESX25519AEADRatchetSession.cpp \ ../../libi2pd/ECIESX25519AEADRatchetSession.cpp \