Compilation fixes

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index c9c7cd721c2dfec452a592fb4ee167ad66564b51..3ce7a54ac2a032dc389d737f8b392d5f718c59b6 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -23,12 +23,20 @@
 // ----------------------------------------------------------------------------
 
 // define off_t
+#ifndef __WXMAC__
 #include  <sys/types.h>
+#else
+typedef long off_t;
+#endif
 
 #ifdef    _MSC_VER
   #define   off_t       _off_t
 #endif
 
+#if defined(__BORLANDC__) && defined(__WIN16__)
+typedef long off_t;
+#endif
+
 const off_t wxInvalidOffset = (off_t)-1;
 
 typedef enum {
@@ -37,6 +45,8 @@ typedef enum {
   wxFromEnd
 } wxSeekMode;
 
+WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
@@ -71,6 +81,11 @@ WXDLLEXPORT void wxDos2UnixFilename(char *s);
 WXDLLEXPORT void wxUnix2DosFilename(char *s);
 #define Unix2DosFilename wxUnix2DosFilename
 
+#ifdef __WXMAC__
+  WXDLLEXPORT void wxMacPathToFSSpec( const char *path , FSSpec *spec ) ;
+  WXDLLEXPORT void wxMac2UnixFilename(char *s);
+  WXDLLEXPORT void wxUnix2MacFilename(char *s);
+#endif
 // Strip the extension, in situ
 WXDLLEXPORT void wxStripExtension(char *buffer);
 WXDLLEXPORT void wxStripExtension(wxString& buffer);
@@ -85,7 +100,7 @@ WXDLLEXPORT char* wxExpandPath(char *dest, const char *path);
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]
 WXDLLEXPORT char* wxContractPath (const wxString& filename,
-   const wxString& envname = "", const wxString& user = "");
+   const wxString& envname = wxEmptyString, const wxString& user = wxEmptyString);
 
 // Destructive removal of /./ and /../ stuff
 WXDLLEXPORT char* wxRealPath(char *path);