andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Make tdnet dependency on OpenSSL private.

Browse Source 
GitOrigin-RevId: 76331149d0d1e77ed0c4a3505ffe3568d98c0c01
This commit is contained in:
levlam 2018-10-15 11:23:51 +03:00
parent 1d32712f6a
commit 803602c4d1
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tdnet/CMakeLists.txt
View File

@ -47,8 +47,8 @@ set(TDNET_SOURCE
add_library(tdnet STATIC ${TDNET_SOURCE}) add_library(tdnet STATIC ${TDNET_SOURCE})
target_include_directories(tdnet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) target_include_directories(tdnet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_include_directories(tdnet SYSTEM PUBLIC $<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>) target_include_directories(tdnet SYSTEM PRIVATE $<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>)
target_link_libraries(tdnet PUBLIC tdutils tdactor ${OPENSSL_LIBRARIES} PRIVATE ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}) target_link_libraries(tdnet PUBLIC tdutils tdactor PRIVATE ${CMAKE_DL_LIBS} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
if (WIN32) if (WIN32)
target_link_libraries(tdnet PRIVATE Crypt32) target_link_libraries(tdnet PRIVATE Crypt32)

2
tdnet/td/net/GetHostByNameActor.h
View File

@ -15,6 +15,7 @@
#include <unordered_map> #include <unordered_map>
namespace td { namespace td {
class GetHostByNameActor final : public td::Actor { class GetHostByNameActor final : public td::Actor {
public: public:
explicit GetHostByNameActor(int32 ok_timeout = CACHE_TIME, int32 error_timeout = ERROR_CACHE_TIME); explicit GetHostByNameActor(int32 ok_timeout = CACHE_TIME, int32 error_timeout = ERROR_CACHE_TIME);
@ -37,4 +38,5 @@ class GetHostByNameActor final : public td::Actor {
Result<td::IPAddress> load_ip(string host, int port, bool prefer_ipv6) TD_WARN_UNUSED_RESULT; Result<td::IPAddress> load_ip(string host, int port, bool prefer_ipv6) TD_WARN_UNUSED_RESULT;
}; };
} // namespace td } // namespace td

2
tdnet/td/net/SslStream.h
View File

@ -34,7 +34,7 @@ class SslStream {
size_t flow_write(Slice slice); size_t flow_write(Slice slice);
explicit operator bool() const { explicit operator bool() const {
return bool(impl_); return static_cast<bool>(impl_);
} }
private: private: