diff src/fileio.c @ 4824:c12b646d84ee

changes to get things to compile under latest cygwin
author Ben Wing <ben@xemacs.org>
date Thu, 24 Dec 2009 19:45:23 -0600
parents aa5ed11f473b
children 780bb5441c14
line wrap: on
line diff
--- a/src/fileio.c	Mon Dec 21 13:51:39 2009 -0700
+++ b/src/fileio.c	Thu Dec 24 19:45:23 2009 -0600
@@ -2325,7 +2325,7 @@
 {
 #if defined(WIN32_NATIVE) || defined(CYGWIN)
 #ifdef CYGWIN
-    char filename_buffer[PATH_MAX];
+    Extbyte filename_buffer[PATH_MAX];
 #endif
 	// Since this has to work for a directory, we can't just call 'CreateFile'
 	PSECURITY_DESCRIPTOR pDesc; /* Must be freed with LocalFree */
@@ -2346,13 +2346,13 @@
     DWORD dwAccessAllowed;
     Extbyte *fnameext;
 
+    C_STRING_TO_TSTR(filename, fnameext);
+
 #ifdef CYGWIN
-    cygwin_conv_to_full_win32_path(filename, filename_buffer);
-    filename = (Ibyte*)filename_buffer;
+    cygwin_conv_to_full_win32_path(fnameext, filename_buffer);
+    fnameext = filename_buffer;
 #endif
 
-    C_STRING_TO_TSTR(filename, fnameext);
-
     // First check for a normal file with the old-style readonly bit
     attributes = qxeGetFileAttributes(fnameext);
     if (FILE_ATTRIBUTE_READONLY == (attributes & (FILE_ATTRIBUTE_DIRECTORY|FILE_ATTRIBUTE_READONLY)))