Mercurial > hg > xemacs-beta
changeset 4988:4cfb6aeb989d
fix compile problems on Windows native
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
Cast pointer when storing value to avoid problems because some
store vars are Extbyte * and some are LPTSTR.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 23:22:59 -0600 |
| parents | 3ee2bdf020bc |
| children | 8f0cf4fd3d2c c0934cef10c6 |
| files | src/ChangeLog src/syswindows.h |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Feb 05 13:43:53 2010 -0700 +++ b/src/ChangeLog Fri Feb 05 23:22:59 2010 -0600 @@ -1,3 +1,9 @@ +2010-02-05 Ben Wing <ben@xemacs.org> + + * syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR): + Cast pointer when storing value to avoid problems because some + store vars are Extbyte * and some are LPTSTR. + 2010-02-05 Jerry James <james@xemacs.org> * s/sco7.h: Add copyright and license header with the permission of
--- a/src/syswindows.h Fri Feb 05 13:43:53 2010 -0700 +++ b/src/syswindows.h Fri Feb 05 23:22:59 2010 -0600 @@ -978,21 +978,22 @@ ttlff_utf8_path = alloca_extbytes (ttlff_size); \ cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \ ttlff, ttlff_utf8_path, ttlff_size); \ - (out) = EXTERNAL_TO_ITEXT (ttlff_utf8_path, Qutf_8); \ + (out) = EXTERNAL_TO_ITEXT (ttlff_utf8_path, Qutf_8); \ } while (0) #else /* not HAVE_CYGWIN_CONV_PATH */ #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ do { \ const Ibyte *lfftt; \ + const Extbyte **lffttout = (const Extbyte **) &(out); \ \ LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (path, lfftt); \ - PATHNAME_CONVERT_OUT_TSTR (lfftt, out); \ + PATHNAME_CONVERT_OUT_TSTR (lfftt, *lffttout); \ } while (0) #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \ do { \ const Ibyte *ttlff; \ \ - ttlff = TSTR_TO_ITEXT (path); \ + ttlff = TSTR_TO_ITEXT (path); \ INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out); \ } while (0) #endif /* (not) HAVE_CYGWIN_CONV_PATH */