Mercurial > hg > xemacs-beta
diff src/sysfile.h @ 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 | aa5ed11f473b |
| children | 95c4ced5c07c |
line wrap: on
line diff
--- a/src/sysfile.h Sun Jan 10 01:06:15 2010 -0600 +++ b/src/sysfile.h Tue Jan 12 01:38:04 2010 -0600 @@ -579,14 +579,25 @@ false, because they just call the native Win32 routines directly, which always use the system-default encoding (which is what Qmswindows_tstr will give us when not XEUNICODE_P). */ +#define PATHNAME_CONVERT_OUT_TSTR(path, pathout) \ +do \ +{ \ + const Ibyte *_pco_path_; \ + PATHNAME_RESOLVE_LINKS (path, _pco_path_); \ + C_STRING_TO_TSTR (_pco_path_, pathout); \ +} while (0) + +#define PATHNAME_CONVERT_OUT_UTF_8(path, pathout) \ +do \ +{ \ + const Ibyte *_pco_path_; \ + PATHNAME_RESOLVE_LINKS (path, _pco_path_); \ + C_STRING_TO_EXTERNAL (_pco_path_, pathout, Qutf_8); \ +} while (0) + #ifdef WIN32_NATIVE -# define PATHNAME_CONVERT_OUT(path, pathout) \ -do \ -{ \ - const Ibyte *_pco_path_; \ - PATHNAME_RESOLVE_LINKS (path, _pco_path_); \ - C_STRING_TO_TSTR (_pco_path_, pathout); \ -} while (0) +#define PATHNAME_CONVERT_OUT(path, pathout) \ + PATHNAME_CONVERT_OUT_TSTR (path, pathout) #else # define PATHNAME_CONVERT_OUT(path, pathout) \ C_STRING_TO_EXTERNAL (path, pathout, Qfile_name)