aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2005-05-09 08:47:09 +0000
committerMax Horn2005-05-09 08:47:09 +0000
commit99b9c27f99d2bd08712cb56732ae7b244dbf9767 (patch)
tree9fa65394b8bbf0efd0eb9b8bb3f8dd41bcdc94ee
parent5093be8401f25431177a2f9ecfb0c876209cc88f (diff)
downloadscummvm-rg350-99b9c27f99d2bd08712cb56732ae7b244dbf9767.tar.gz
scummvm-rg350-99b9c27f99d2bd08712cb56732ae7b244dbf9767.tar.bz2
scummvm-rg350-99b9c27f99d2bd08712cb56732ae7b244dbf9767.zip
Why not fix the warning if you encounter it? :-)
svn-id: r17994
-rw-r--r--backends/fs/windows/windows-fs.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/fs/windows/windows-fs.cpp b/backends/fs/windows/windows-fs.cpp
index 38f00b68f2..4ddece6b3a 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -54,7 +54,7 @@ public:
private:
static char *toAscii(TCHAR *x);
- static TCHAR* toUnicode(const char *x);
+ static const TCHAR* toUnicode(const char *x);
static void addFile (FSList &list, ListMode mode, const char *base, WIN32_FIND_DATA* find_data);
};
@@ -70,9 +70,9 @@ char* WindowsFilesystemNode::toAscii(TCHAR *x) {
#endif
}
-TCHAR* WindowsFilesystemNode::toUnicode(const char *x) {
+const TCHAR* WindowsFilesystemNode::toUnicode(const char *x) {
#ifndef UNICODE
- return (TCHAR *)x;
+ return (const TCHAR *)x;
#else
static TCHAR unicodeString[MAX_PATH];
MultiByteToWideChar(CP_ACP, 0, x, strlen(x) + 1, unicodeString, sizeof(unicodeString) / sizeof(TCHAR));