aboutsummaryrefslogtreecommitdiff
path: root/backends/fs/windows
diff options
context:
space:
mode:
authorTravis Howell2002-11-24 09:24:09 +0000
committerTravis Howell2002-11-24 09:24:09 +0000
commitefd0ef1e79ccd402c128157adcecf3aa7d46a6ea (patch)
tree631e3d0a94f9b1de853af3775f626c2c50c72472 /backends/fs/windows
parent7b3951520365dfdecd0feb91657bc95bcd5b75ff (diff)
downloadscummvm-rg350-efd0ef1e79ccd402c128157adcecf3aa7d46a6ea.tar.gz
scummvm-rg350-efd0ef1e79ccd402c128157adcecf3aa7d46a6ea.tar.bz2
scummvm-rg350-efd0ef1e79ccd402c128157adcecf3aa7d46a6ea.zip
Fix warning
svn-id: r5705
Diffstat (limited to 'backends/fs/windows')
-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 e646d395a0..2cdb0d625c 100644
--- a/backends/fs/windows/windows-fs.cpp
+++ b/backends/fs/windows/windows-fs.cpp
@@ -61,22 +61,22 @@ private:
char* WindowsFilesystemNode::toAscii(TCHAR *x) {
-static char asciiString[MAX_PATH];
#ifndef UNICODE
return (char*)x;
-#else
+#else
+ static char asciiString[MAX_PATH];
WideCharToMultiByte(CP_ACP, 0, x, _tcslen(x) + 1, asciiString, sizeof(asciiString), NULL, NULL);
return asciiString;
#endif
}
TCHAR* WindowsFilesystemNode::toUnicode(char *x) {
-static TCHAR unicodeString[MAX_PATH];
#ifndef UNICODE
return (TCHAR*)x;
#else
+ static TCHAR unicodeString[MAX_PATH];
MultiByteToWideChar(CP_ACP, 0, x, strlen(x) + 1, unicodeString, sizeof(unicodeString));
return unicodeString;
#endif