diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/os/os.cxx | 6 | ||||
| -rw-r--r-- | common/os/os.h | 6 | ||||
| -rw-r--r-- | common/rdr/Exception.cxx | 1 | ||||
| -rw-r--r-- | common/rfb/WinPasswdValidator.cxx | 7 |
4 files changed, 6 insertions, 14 deletions
diff --git a/common/os/os.cxx b/common/os/os.cxx index aa9e2bae..31dbe5f3 100644 --- a/common/os/os.cxx +++ b/common/os/os.cxx @@ -44,7 +44,7 @@ static int gethomedir(char **dirp, bool userDir) uid_t uid; struct passwd *passwd; #else - TCHAR *dir; + char *dir; BOOL ret; #endif @@ -73,7 +73,7 @@ static int gethomedir(char **dirp, bool userDir) else memcpy(dir + len, "/.vnc/\0", 7); #else - dir = new TCHAR[MAX_PATH]; + dir = new char[MAX_PATH]; if (dir == NULL) return -1; @@ -89,7 +89,7 @@ static int gethomedir(char **dirp, bool userDir) if (userDir) dir[strlen(dir)+1] = '\0'; else - memcpy(dir+strlen(dir), (TCHAR *)"\\vnc\\\0", 6); + memcpy(dir+strlen(dir), "\\vnc\\\0", 6); #endif *dirp = dir; return 0; diff --git a/common/os/os.h b/common/os/os.h index d0717fd0..62acf829 100644 --- a/common/os/os.h +++ b/common/os/os.h @@ -24,9 +24,6 @@ * If HOME environment variable is set then it is used. * Otherwise home directory is obtained via getpwuid function. * - * Note for Windows: - * This functions returns array of TCHARs, not array of chars. - * * Returns: * 0 - Success * -1 - Failure @@ -38,9 +35,6 @@ int getvnchomedir(char **dirp); * If HOME environment variable is set then it is used. * Otherwise home directory is obtained via getpwuid function. * - * Note for Windows: - * This functions returns array of TCHARs, not array of chars. - * * Returns: * 0 - Success * -1 - Failure diff --git a/common/rdr/Exception.cxx b/common/rdr/Exception.cxx index 382fea3d..b1e0a841 100644 --- a/common/rdr/Exception.cxx +++ b/common/rdr/Exception.cxx @@ -28,7 +28,6 @@ #include <rdr/Exception.h> #include <rdr/TLSException.h> #ifdef _WIN32 -#include <tchar.h> #include <winsock2.h> #include <windows.h> #include <ws2tcpip.h> diff --git a/common/rfb/WinPasswdValidator.cxx b/common/rfb/WinPasswdValidator.cxx index f07c27e8..18f113cd 100644 --- a/common/rfb/WinPasswdValidator.cxx +++ b/common/rfb/WinPasswdValidator.cxx @@ -24,7 +24,6 @@ #include <rfb/WinPasswdValidator.h> #include <windows.h> -#include <tchar.h> using namespace rfb; @@ -33,9 +32,9 @@ bool WinPasswdValidator::validateInternal(rfb::SConnection* /*sc*/, const char* username, const char* password) { - TCHAR* user = (TCHAR*) strDup(username); - TCHAR* pass = (TCHAR*) strDup(password); - TCHAR* domain = (TCHAR*) strDup("."); + char* user = strDup(username); + char* pass = strDup(password); + char* domain = strDup("."); HANDLE handle; BOOL ret = LogonUser(user, domain, pass, LOGON32_LOGON_NETWORK, |