From f182b358f4b36487f541008c26aabe7e89329b90 Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 6 Sep 2019 22:51:10 +0200 Subject: [PATCH] fixed compilation in new getpass method --- libretroshare/src/util/rskbdinput.cc | 10 ++++++++-- libretroshare/src/util/rskbdinput.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libretroshare/src/util/rskbdinput.cc b/libretroshare/src/util/rskbdinput.cc index 24593b9ee..b800b7b2a 100644 --- a/libretroshare/src/util/rskbdinput.cc +++ b/libretroshare/src/util/rskbdinput.cc @@ -20,12 +20,15 @@ #ifndef __ANDROID__ +#include + #ifdef WINDOWS_SYS #include #include #define PASS_MAX 512 +namespace RsUtil { std::string rs_getpass(const std::string& prompt,bool no_echo) { static char getpassbuf [PASS_MAX + 1]; @@ -60,6 +63,7 @@ std::string rs_getpass(const std::string& prompt,bool no_echo) return std::string(getpassbuf); } +} #else #include @@ -84,7 +88,9 @@ static int getch() return ch; } -std::string rs_getpass(const char *prompt, bool no_echo) +namespace RsUtil { + +std::string rs_getpass(const std::string& prompt, bool no_echo) { const char BACKSPACE=127; const char RETURN=10; @@ -118,6 +124,6 @@ std::string rs_getpass(const char *prompt, bool no_echo) return std::string(password); } +} #endif - #endif diff --git a/libretroshare/src/util/rskbdinput.h b/libretroshare/src/util/rskbdinput.h index 9a4483626..edd44df1c 100644 --- a/libretroshare/src/util/rskbdinput.h +++ b/libretroshare/src/util/rskbdinput.h @@ -18,6 +18,8 @@ * * *******************************************************************************/ +#include + namespace RsUtil { std::string rs_getpass(const std::string& prompt,bool no_echo=true) ;