From b3a7bdd88022fcd78310ed8a8262bcdf1bf1daa4 Mon Sep 17 00:00:00 2001 From: Seva Date: Tue, 13 Aug 2019 16:25:33 -0400 Subject: [PATCH] cppflags: rm OPENDHT_PROXY_OPENSSL last occurences --- CMakeLists.txt | 1 - configure.ac | 1 - include/opendht/http.h | 6 +----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eca29eb3..1205447f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,6 @@ if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT) if (OPENSSL_FOUND) message(STATUS "Found OpenSSL ${OPENSSL_VERSION}") include_directories(${OPENSSL_INCLUDE_DIRS}) - add_definitions(-DOPENDHT_PROXY_OPENSSL) else () message(SEND_ERROR "OpenSSL is required for DHT proxy as specified") endif() diff --git a/configure.ac b/configure.ac index 21614c3a..8e5452e1 100644 --- a/configure.ac +++ b/configure.ac @@ -147,7 +147,6 @@ AS_IF([test "x$with_openssl" != "xno"], [have_openssl=no]) AS_IF([test "x$have_openssl" = "xyes"], [ AC_MSG_NOTICE([Using OpenSSL]) - CPPFLAGS+=" -DOPENDHT_PROXY_OPENSSL=1" ], [ AC_MSG_NOTICE([Not using OpenSSL]) ]) diff --git a/include/opendht/http.h b/include/opendht/http.h index 9aceb39f..f48e65c5 100644 --- a/include/opendht/http.h +++ b/include/opendht/http.h @@ -19,9 +19,7 @@ #pragma once #include -#ifdef OPENDHT_PROXY_OPENSSL #include "asio/ssl.hpp" -#endif #include #include #include @@ -200,10 +198,8 @@ public: unsigned int id() const; void set_connection(std::shared_ptr connection); std::shared_ptr get_connection() const; -#ifdef OPENDHT_PROXY_OPENSSL - void set_certificate(std::shared_ptr certificate); -#endif + void set_certificate(std::shared_ptr certificate); void set_logger(std::shared_ptr logger); /**