comparison src/syswindows.h @ 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 4aebb0131297
children cfe36e196dc7
comparison
equal deleted inserted replaced
4987:3ee2bdf020bc 4988:4cfb6aeb989d
976 ttlff_size = cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \ 976 ttlff_size = cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \
977 ttlff, NULL, 0); \ 977 ttlff, NULL, 0); \
978 ttlff_utf8_path = alloca_extbytes (ttlff_size); \ 978 ttlff_utf8_path = alloca_extbytes (ttlff_size); \
979 cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \ 979 cygwin_conv_path (CCP_WIN_T_TO_POSIX | CCP_RELATIVE, \
980 ttlff, ttlff_utf8_path, ttlff_size); \ 980 ttlff, ttlff_utf8_path, ttlff_size); \
981 (out) = EXTERNAL_TO_ITEXT (ttlff_utf8_path, Qutf_8); \ 981 (out) = EXTERNAL_TO_ITEXT (ttlff_utf8_path, Qutf_8); \
982 } while (0) 982 } while (0)
983 #else /* not HAVE_CYGWIN_CONV_PATH */ 983 #else /* not HAVE_CYGWIN_CONV_PATH */
984 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ 984 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out) \
985 do { \ 985 do { \
986 const Ibyte *lfftt; \ 986 const Ibyte *lfftt; \
987 const Extbyte **lffttout = (const Extbyte **) &(out); \
987 \ 988 \
988 LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (path, lfftt); \ 989 LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (path, lfftt); \
989 PATHNAME_CONVERT_OUT_TSTR (lfftt, out); \ 990 PATHNAME_CONVERT_OUT_TSTR (lfftt, *lffttout); \
990 } while (0) 991 } while (0)
991 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \ 992 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out) \
992 do { \ 993 do { \
993 const Ibyte *ttlff; \ 994 const Ibyte *ttlff; \
994 \ 995 \
995 ttlff = TSTR_TO_ITEXT (path); \ 996 ttlff = TSTR_TO_ITEXT (path); \
996 INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out); \ 997 INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out); \
997 } while (0) 998 } while (0)
998 #endif /* (not) HAVE_CYGWIN_CONV_PATH */ 999 #endif /* (not) HAVE_CYGWIN_CONV_PATH */
999 1000
1000 #define LISP_LOCAL_FILE_FORMAT_TO_TSTR(path, out) \ 1001 #define LISP_LOCAL_FILE_FORMAT_TO_TSTR(path, out) \