compilation fix for cygwin

[wxWidgets.git] / include / wx / filefn.h

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index a0fd19d272ef424389522bc0f3fc9273424f8b6a..45e3648086afdfe9c2b6ec0fb3eefef487d5947a 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -12,7 +12,7 @@
 #ifndef   _FILEFN_H_
 #define   _FILEFN_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "filefn.h"
 #endif
 
@@ -66,7 +66,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 // ----------------------------------------------------------------------------
 
 // Microsoft compiler loves underscores, feed them to it
-#if defined( __VISUALC__ ) || wxCHECK_W32API_VERSION( 0, 5 ) \
+#if defined( __VISUALC__ ) \
+    || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \
     || ( defined(__MWERKS__) && defined(__WXMSW__) )
     // functions
     #define   wxClose      _close
@@ -79,20 +80,24 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #define   wxTell       _tell
 
     #if wxUSE_UNICODE
-        #define   wxOpen       _wopen
-        #define   wxAccess     _waccess
-
-        #define   wxMkDir      _wmkdir
-        #define   wxRmDir      _wrmdir
-
-        #define   wxStat       _wstat
+        #if wxUSE_UNICODE_MSLU
+            #define   wxOpen       wxMSLU__wopen
+            #define   wxAccess     wxMSLU__waccess
+            #define   wxMkDir      wxMSLU__wmkdir
+            #define   wxRmDir      wxMSLU__wrmdir
+            #define   wxStat       wxMSLU__wstat
+        #else
+            #define   wxOpen       _wopen
+            #define   wxAccess     _waccess
+            #define   wxMkDir      _wmkdir
+            #define   wxRmDir      _wrmdir
+            #define   wxStat       _wstat
+        #endif
     #else // !wxUSE_UNICODE
         #define   wxOpen       _open
         #define   wxAccess     _access
-
         #define   wxMkDir      _mkdir
         #define   wxRmDir      _rmdir
-
         #define   wxStat       _stat
     #endif
 
@@ -114,13 +119,11 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #endif // O_RDONLY
 #else
     // functions
-    #define   wxOpen       open
     #define   wxClose      close
     #define   wxRead       read
     #define   wxWrite      write
     #define   wxLseek      lseek
     #define   wxFsync      commit
-    #define   wxAccess     access
     #define   wxEof        eof
 
     #define   wxMkDir      mkdir
@@ -128,10 +131,18 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
     #define   wxTell(fd)   lseek(fd, 0, SEEK_CUR)
 
-    #define   wxStat       stat
-
-    // types
     #define   wxStructStat struct stat
+    
+#if wxUSE_UNICODE
+#   define wxNEED_WX_UNISTD_H
+WXDLLEXPORT int wxStat( const wxChar *file_name, wxStructStat *buf );
+WXDLLEXPORT int wxAccess( const wxChar *pathname, int mode );
+WXDLLEXPORT int wxOpen( const wxChar *pathname, int flags, mode_t mode );
+#else
+    #define   wxOpen       open
+    #define   wxStat       stat
+    #define   wxAccess     access
+#endif
 
 #endif  // VC++
 
@@ -168,23 +179,11 @@ WXDLLEXPORT void wxDos2UnixFilename(wxChar *s);
 WXDLLEXPORT void wxUnix2DosFilename(wxChar *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
-#ifdef __WXMAC__
-WXDLLEXPORT wxString wxMacFSSpec2MacFilename( const FSSpec *spec ) ;
-WXDLLEXPORT void wxMacFilename2FSSpec( const char *path , FSSpec *spec ) ;
-#  ifndef __DARWIN__
-// Mac file names are POSIX (Unix style) under Darwin, so these are not needed
-WXDLLEXPORT wxString wxMacFSSpec2UnixFilename( const FSSpec *spec ) ;
-WXDLLEXPORT void wxUnixFilename2FSSpec( const char *path , FSSpec *spec ) ;
-WXDLLEXPORT wxString wxMac2UnixFilename( const char *s) ;
-WXDLLEXPORT wxString wxUnix2MacFilename( const char *s);
-#  endif
-#endif
-
 // Strip the extension, in situ
 WXDLLEXPORT void wxStripExtension(wxChar *buffer);
 WXDLLEXPORT void wxStripExtension(wxString& buffer);
 
-// Get a temporary filename, opening and closing the file.
+// Get a temporary filename
 WXDLLEXPORT wxChar* wxGetTempFileName(const wxString& prefix, wxChar *buf = (wxChar *) NULL);
 WXDLLEXPORT bool wxGetTempFileName(const wxString& prefix, wxString& buf);
 
@@ -196,8 +195,8 @@ WXDLLEXPORT bool wxExpandPath(wxString& dest, const wxChar *path);
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]
 WXDLLEXPORT wxChar* wxContractPath(const wxString& filename,
-                                  const wxString& envname = wxEmptyString,
-                                  const wxString& user = wxEmptyString);
+                                   const wxString& envname = wxEmptyString,
+                                   const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff
 WXDLLEXPORT wxChar* wxRealPath(wxChar *path);
@@ -252,16 +251,21 @@ WXDLLEXPORT bool wxMkdir(const wxString& dir, int perm = 0777);
 // Remove directory. Flags reserved for future use.
 WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
+// ----------------------------------------------------------------------------
 // separators in file names
+// ----------------------------------------------------------------------------
+
+// between file name and extension
 #define wxFILE_SEP_EXT        wxT('.')
+
+// between drive/volume name and the path
 #define wxFILE_SEP_DSK        wxT(':')
+
+// between the path components
 #define wxFILE_SEP_PATH_DOS   wxT('\\')
 #define wxFILE_SEP_PATH_UNIX  wxT('/')
 #define wxFILE_SEP_PATH_MAC   wxT(':')
-#define wxFILE_SEP_PATH_VMS   wxT('/') //This is the Unix way, but somtimes
-                                       //users will give the VMS native paths
-                                       //and than a ']' is needed.
-                                       //         Jouk
+#define wxFILE_SEP_PATH_VMS   wxT('.') // VMS also uses '[' and ']'
 
 // separator in the path list (as in PATH environment variable)
 // there is no PATH variable in Classic Mac OS so just use the
@@ -272,12 +276,15 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 #define wxPATH_SEP_MAC        wxT(";")
 
 // platform independent versions
-#if defined(__UNIX__)
+#if defined(__UNIX__) && !defined(__CYGWIN__)
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_UNIX
   #define wxPATH_SEP          wxPATH_SEP_UNIX
 #elif defined(__MAC__)
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_MAC
   #define wxPATH_SEP          wxPATH_SEP_MAC
+#elif defined(__CYGWIN__) // Cygwin
+  #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
+  #define wxPATH_SEP          wxPATH_SEP_UNIX
 #else   // Windows and OS/2
   #define wxFILE_SEP_PATH     wxFILE_SEP_PATH_DOS
   #define wxPATH_SEP          wxPATH_SEP_DOS
@@ -293,7 +300,14 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
 
 // is the char a path separator?
 inline bool wxIsPathSeparator(wxChar c)
-  { return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX; }
+{
+    // under DOS/Windows we should understand both Unix and DOS file separators
+#if defined(__UNIX__) || defined(__MAC__)
+    return c == wxFILE_SEP_PATH;
+#else
+    return c == wxFILE_SEP_PATH_DOS || c == wxFILE_SEP_PATH_UNIX;
+#endif
+}
 
 // does the string ends with path separator?
 WXDLLEXPORT bool wxEndsWithPathSeparator(const wxChar *pszFileName);