X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fmake-file.c;h=3cbf00623d200e22075c8c06f61500bf1d5a0c80;hb=55178119a1dd305b7e0c3254cf5b6ddf6784e34f;hp=af1dc5742b6849f8e2c1d73c014d5ac74b30f898;hpb=51ae576dcac25a9e196a2a7e8f6e692fa3c63d29;p=pspp

diff --git a/src/data/make-file.c b/src/data/make-file.c
index af1dc5742b..3cbf00623d 100644
--- a/src/data/make-file.c
+++ b/src/data/make-file.c
@@ -45,7 +45,6 @@
 
 #if defined _WIN32 || defined __WIN32__
 #define WIN32_LEAN_AND_MEAN  /* avoid including junk */
-#define UNICODE 1
 #include <windows.h>
 #define TS_stat _stat
 #define Tunlink _wunlink
@@ -149,11 +148,11 @@ Trename (TCHAR const *src, TCHAR const *dst)
   return -1;
 }
 
-static TCHAR * 
+TCHAR * 
 convert_to_filename_encoding (const char *s, size_t len, const char *current_encoding)
 {
   const char *enc = current_encoding;
-  if (0 == strcmp (current_encoding, "Auto"))
+  if (NULL == enc || 0 == strcmp (enc, "Auto"))
     enc = locale_charset ();
 
   return (TCHAR *) recode_string ("UTF-16LE", enc, s, len);
@@ -161,14 +160,13 @@ convert_to_filename_encoding (const char *s, size_t len, const char *current_enc
 
 
 #else
-typedef char TCHAR;
 #define TS_stat stat
 #define Trename rename
 #define Tunlink unlink
 #define Topen open
 #define Tstat stat
 
-static TCHAR * 
+TCHAR * 
 convert_to_filename_encoding (const char *s, size_t len UNUSED, const char *current_encoding UNUSED)
 {
   /* Non-windows systems don't care about the encoding.