Mercurial > hg > xemacs-beta
diff src/win32.c @ 4834:b3ea9c582280
Use new cygwin_conv_path API with Cygwin 1.7 for converting names between Win32 and POSIX, UTF-8-aware, with attendant changes elsewhere
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 12 Jan 2010 01:38:04 -0600 |
| parents | 902d5bd9b75c |
| children | 95c4ced5c07c |
line wrap: on
line diff
--- a/src/win32.c Sun Jan 10 01:06:15 2010 -0600 +++ b/src/win32.c Tue Jan 12 01:38:04 2010 -0600 @@ -70,7 +70,7 @@ { Ibyte *pseudo_url; - WIN32_TO_LOCAL_FILE_FORMAT (filename, filename); + INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (filename, filename); pseudo_url = xnew_array (Ibyte, 5 + qxestrlen (filename) + 1); qxestrcpy_ascii (pseudo_url, "file:"); qxestrcat (pseudo_url, filename); @@ -93,7 +93,7 @@ Ibyte *ttlff; TSTR_TO_C_STRING (path, ttlff); - WIN32_TO_LOCAL_FILE_FORMAT (ttlff, ttlff); + INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, ttlff); return build_intstring (ttlff); } @@ -350,9 +350,9 @@ if (STRINGP (parameters)) LISP_STRING_TO_TSTR (parameters, parmext); if (STRINGP (current_dir)) - LOCAL_FILE_FORMAT_TO_TSTR (current_dir, path); + LISP_LOCAL_FILE_FORMAT_TO_TSTR (current_dir, path); if (STRINGP (document)) - LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR (document, doc); + LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR (document, doc); ret = (int) qxeShellExecute (NULL, opext, doc, parmext, path, (INTP (show_flag) ? @@ -404,7 +404,7 @@ return path; /* Use mule and cygwin-safe APIs top get at file data. */ - LOCAL_TO_WIN32_FILE_FORMAT (p, p); + LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (p, p); return build_intstring (p); } #endif