diff --git a/src/raspberrypi/devices/cfilesystem.cpp b/src/raspberrypi/devices/cfilesystem.cpp index 0765a516..2ad123c3 100644 --- a/src/raspberrypi/devices/cfilesystem.cpp +++ b/src/raspberrypi/devices/cfilesystem.cpp @@ -1147,7 +1147,7 @@ void CHostFilename::SetEntryName() BOOL CHostFilename::isReduce() const { - return strcmp((LPTSTR)m_szHost, (const char*)m_szHuman) != 0; /// @warning Unicode時要修正 → 済 + return strcmp((char *)m_szHost, (const char*)m_szHuman) != 0; /// @warning Unicode時要修正 → 済 } //--------------------------------------------------------------------------- diff --git a/src/raspberrypi/filepath.cpp b/src/raspberrypi/filepath.cpp index 695f94be..18c51b26 100644 --- a/src/raspberrypi/filepath.cpp +++ b/src/raspberrypi/filepath.cpp @@ -78,7 +78,7 @@ void Filepath::SetPath(const char *path) ASSERT(strlen(path) < _MAX_PATH); // Copy pathname - strcpy(m_szPath, (LPTSTR)path); + strcpy(m_szPath, (char *)path); // Split Split(); @@ -91,24 +91,17 @@ void Filepath::SetPath(const char *path) //--------------------------------------------------------------------------- void Filepath::Split() { - LPTSTR pDir; - LPTSTR pDirName; - LPTSTR pBase; - LPTSTR pBaseName; - LPTSTR pExtName; - - // パーツを初期化 m_szDir[0] = _T('\0'); m_szFile[0] = _T('\0'); m_szExt[0] = _T('\0'); // 分離 - pDir = strdup(m_szPath); - pDirName = dirname(pDir); - pBase = strdup(m_szPath); - pBaseName = basename(pBase); - pExtName = strrchr(pBaseName, '.'); + char *pDir = strdup(m_szPath); + char *pDirName = dirname(pDir); + char *pBase = strdup(m_szPath); + char *pBaseName = basename(pBase); + char *pExtName = strrchr(pBaseName, '.'); // 転送 if (pDirName) { diff --git a/src/raspberrypi/os.h b/src/raspberrypi/os.h index 6f4e2349..4d6a1a34 100644 --- a/src/raspberrypi/os.h +++ b/src/raspberrypi/os.h @@ -107,7 +107,6 @@ typedef uint16_t WORD; typedef uint32_t DWORD; typedef int BOOL; typedef char TCHAR; -typedef char *LPTSTR; #if !defined(FALSE) #define FALSE 0