Changes for mingw32/gcc-2.95

[wxWidgets.git] / src / common / filefn.cpp

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index c809581d8d0967e19d7ab8d43c78d0e33264f527..7461ca1dd46ec5a3a04b260c497afd56f213e256 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -1035,7 +1035,7 @@ bool wxMkdir(const wxString& dir, int perm)
 #if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
 #else  // MSW and OS/2
 #if (!(defined(__WXMSW__) || defined(__WXPM__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__)
     if ( mkdir(wxFNCONV(dirname), perm) != 0 )
 #else  // MSW and OS/2

-    if ( mkdir((char*)wxFNCONV(dirname)) != 0 )
+    if ( mkdir(FNSTRINGCAST wxFNCONV(dirname)) != 0 )

 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
 #endif // !MSW/MSW
     {
         wxLogSysError(_("Directory '%s' couldn't be created"), dirname);


@@ -1503,7 +1503,7 @@ wxString wxGetCwd()
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)
 bool wxSetWorkingDirectory(const wxString& d)
 {
 #if defined( __UNIX__ ) || defined( __WXMAC__ ) || defined(__WXPM__)

-  return (chdir((char*)d.fn_str()) == 0);
+  return (chdir(FNSTRINGCAST d.fn_str()) == 0);

 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__
 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__