1. registry files corresponding to the recent registry.h changes

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

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 3ce7a54ac2a032dc389d737f8b392d5f718c59b6..ae1bf310325e9217694f99e5b1df117331291b10 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -37,6 +37,10 @@ typedef long off_t;
 typedef long off_t;
 #endif
 
 typedef long off_t;
 #endif
 

+#if defined(__SC__)
+typedef long off_t;
+#endif
+

 const off_t wxInvalidOffset = (off_t)-1;
 
 typedef enum {
 const off_t wxInvalidOffset = (off_t)-1;
 
 typedef enum {


@@ -99,8 +103,9 @@ WXDLLEXPORT char* wxExpandPath(char *dest, const char *path);
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]
 // Contract w.r.t environment (</usr/openwin/lib, OPENWHOME> -> ${OPENWINHOME}/lib)
 // and make (if under the home tree) relative to home
 // [caller must copy-- volatile]

-WXDLLEXPORT char* wxContractPath (const wxString& filename,
-   const wxString& envname = wxEmptyString, const wxString& user = wxEmptyString);
+WXDLLEXPORT char* wxContractPath(const wxString& filename,
+                                 const wxString& envname = "",
+                                 const wxString& user = "");

 
 // Destructive removal of /./ and /../ stuff
 WXDLLEXPORT char* wxRealPath(char *path);
 
 // Destructive removal of /./ and /../ stuff
 WXDLLEXPORT char* wxRealPath(char *path);