diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/console_handler.h | 2 | ||||
| -rw-r--r-- | contrib/epee/include/net/http_auth.h | 13 | ||||
| -rw-r--r-- | contrib/otshell_utils/CMakeLists.txt | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/contrib/epee/include/console_handler.h b/contrib/epee/include/console_handler.h index 2ad92b3f2..554a48488 100644 --- a/contrib/epee/include/console_handler.h +++ b/contrib/epee/include/console_handler.h @@ -133,7 +133,7 @@ namespace epee bool wait_stdin_data() { #if !defined(WIN32) - #ifdef __OpenBSD__ + #if defined(__OpenBSD__) || defined(__ANDROID__) int stdin_fileno = fileno(stdin); #else int stdin_fileno = ::fileno(stdin); diff --git a/contrib/epee/include/net/http_auth.h b/contrib/epee/include/net/http_auth.h index 1931b6115..795d213d9 100644 --- a/contrib/epee/include/net/http_auth.h +++ b/contrib/epee/include/net/http_auth.h @@ -45,15 +45,22 @@ namespace net_utils public: struct login { - login() = delete; + login() : username(), password() {} + login(std::string username_, std::string password_) + : username(std::move(username_)), password(std::move(password_)) + {} + std::string username; std::string password; }; struct session { - session() = delete; - const login credentials; + session(login credentials_) + : credentials(std::move(credentials_)), nonce(), counter(0) + {} + + login credentials; std::string nonce; std::uint32_t counter; }; diff --git a/contrib/otshell_utils/CMakeLists.txt b/contrib/otshell_utils/CMakeLists.txt index 464b125e4..263f07c85 100644 --- a/contrib/otshell_utils/CMakeLists.txt +++ b/contrib/otshell_utils/CMakeLists.txt @@ -3,6 +3,10 @@ project (otshell CXX) # Add executable +if(APPLE AND POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) +endif() + file(GLOB otshell_utils_sources # All files in directory: "*.h" "*.hpp" |