[Scummvm-cvs-logs] CVS: scummvm/backends/fs/windows windows-fs.cpp,1.9,1.10

Travis Howell kirben at users.sourceforge.net
Sun Nov 24 01:25:02 CET 2002


Update of /cvsroot/scummvm/scummvm/backends/fs/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv5508/backends/fs/windows

Modified Files:
	windows-fs.cpp 
Log Message:

Fix warning


Index: windows-fs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/windows/windows-fs.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- windows-fs.cpp	20 Nov 2002 08:04:08 -0000	1.9
+++ windows-fs.cpp	24 Nov 2002 09:24:09 -0000	1.10
@@ -61,22 +61,22 @@
 
 
 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





More information about the Scummvm-git-logs mailing list