# HG changeset patch
# User Mike Sperber <sperber@deinprogramm.de>
# Date 1263800889 -3600
# Node ID 0dd76c7b78464157161eca47049933c239c06434
# Parent  7822019c5d98aba05da483786cc0fae4f1f68bb3# Parent  8b7644c73fd222c899d0536465c3f1e11cd927f1
Merge.

diff -r 8b7644c73fd2 -r 0dd76c7b7846 src/ChangeLog
--- a/src/ChangeLog	Sun Jan 17 12:38:15 2010 +0100
+++ b/src/ChangeLog	Mon Jan 18 08:48:09 2010 +0100
@@ -1,3 +1,10 @@
+2010-01-17  Vin Shelton  <acs@xemacs.org>
+
+	* fileio.c (check_writable): Remove cast from 2010-01-14
+
+	* syswindows.h: Use consts in macros where appropriate in lieu of
+	cast in check_writable().  Patch from Ben Wing.
+
 2010-01-16  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* config.h.in:
diff -r 8b7644c73fd2 -r 0dd76c7b7846 src/fileio.c
--- a/src/fileio.c	Sun Jan 17 12:38:15 2010 +0100
+++ b/src/fileio.c	Mon Jan 18 08:48:09 2010 +0100
@@ -2344,7 +2344,7 @@
   DWORD dwAccessAllowed;
   Extbyte *fnameext;
 
-  LOCAL_FILE_FORMAT_TO_TSTR ((Ibyte *)filename, fnameext);
+  LOCAL_FILE_FORMAT_TO_TSTR (filename, fnameext);
 
   // First check for a normal file with the old-style readonly bit
   attributes = qxeGetFileAttributes(fnameext);
diff -r 8b7644c73fd2 -r 0dd76c7b7846 src/syswindows.h
--- a/src/syswindows.h	Sun Jan 17 12:38:15 2010 +0100
+++ b/src/syswindows.h	Mon Jan 18 08:48:09 2010 +0100
@@ -977,14 +977,14 @@
 #else /* not HAVE_CYGWIN_CONV_PATH */
 #define LOCAL_FILE_FORMAT_TO_TSTR(path, out)		\
 do {							\
-  Ibyte *lfftt;						\
+  const Ibyte *lfftt;					\
 							\
   LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN (path, lfftt);	\
   PATHNAME_CONVERT_OUT_TSTR (lfftt, out);		\
 } while (0)
 #define TSTR_TO_LOCAL_FILE_FORMAT(path, out)		\
 do {							\
-  Ibyte *ttlff;						\
+  const Ibyte *ttlff;					\
 							\
   TSTR_TO_C_STRING (path, ttlff);			\
   INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT (ttlff, out);	\
@@ -1012,7 +1012,7 @@
 #define LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN(path, pathout)	\
 do								\
   {								\
-    Extbyte *lfftiwp;						\
+    const Extbyte *lfftiwp;					\
 								\
     LOCAL_FILE_FORMAT_TO_TSTR (path, lfftiwp);			\
     TSTR_TO_C_STRING (lfftiwp, pathout);			\
@@ -1020,7 +1020,7 @@
 while (0)
 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout)	\
 do {								\
-  Extbyte *iwtlffp;						\
+  const Extbyte *iwtlffp;					\
   C_STRING_TO_TSTR (path, iwtlffp);				\
   TSTR_TO_LOCAL_FILE_FORMAT (iwtlffp, pathout);			\
 } while (0)
@@ -1034,7 +1034,7 @@
      get 7-bit ISO2022-encoded data.  We know that our internal format	\
      is ASCII-compatible, and so these functions will work fine with	\
      this data. */							\
-  Ibyte *lfftiwp = (path);						\
+  const Ibyte *lfftiwp = (path);					\
   if (isalpha (lfftiwp[0]) && (IS_DEVICE_SEP (lfftiwp[1])))		\
     pathout = lfftiwp;							\
   else									\
@@ -1047,7 +1047,7 @@
 } while (0)
 #define INTERNAL_MSWIN_TO_LOCAL_FILE_FORMAT(path, pathout)		\
 do {									\
-  Ibyte *wtlff1 = (path);						\
+  const Ibyte *wtlff1 = (path);						\
   int wtlff2 =								\
     cygwin_win32_to_posix_path_list_buf_size ((char *) wtlff1);		\
   Ibyte *wtlff3 = alloca_ibytes (wtlff2);				\