PyCrust updates from their CVS.

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 1976a20601dbaf6f597c325c745f6d8626f9f849..70d467e744b424e795899c4ed0339f1b8f90a555 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -253,7 +253,11 @@ long wxExecute( const wxString& command, int flags, wxProcess *process )
     argv[argc] = NULL;
 
     // do execute the command
     argv[argc] = NULL;
 
     // do execute the command

+#if wxUSE_UNICODE
+    long lRc = -1;
+#else

     long lRc = wxExecute(argv, flags, process);
     long lRc = wxExecute(argv, flags, process);

+#endif

 
     // clean up
     argc = 0;
 
     // clean up
     argc = 0;


@@ -582,6 +586,9 @@ private:
 // ----------------------------------------------------------------------------
 // wxExecute: the real worker function
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxExecute: the real worker function
 // ----------------------------------------------------------------------------

+#ifdef __VMS
+#pragma message disable codeunreachable
+#endif

 
 long wxExecute(wxChar **argv,
                int flags,
 
 long wxExecute(wxChar **argv,
                int flags,


@@ -844,7 +851,12 @@ long wxExecute(wxChar **argv,
         return exitcode;
 #endif // wxUSE_GUI
     }
         return exitcode;
 #endif // wxUSE_GUI
     }

+
+    return ERROR_RETURN_CODE;

 }
 }

+#ifdef __VMS
+#pragma message enable codeunreachable
+#endif

 
 #undef ERROR_RETURN_CODE
 #undef ARGS_CLEANUP
 
 #undef ERROR_RETURN_CODE
 #undef ARGS_CLEANUP


@@ -1097,9 +1109,9 @@ bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
     // the case to "char *" is needed for AIX 4.3
     wxStatFs fs;
 #if defined(HAVE_STATFS) || defined(HAVE_STATVFS)
     // the case to "char *" is needed for AIX 4.3
     wxStatFs fs;

-    if ( statfs((char *)path.fn_str(), &fs) != 0 )
+    if ( statfs((char *)(const char*)path.fn_str(), &fs) != 0 )

     {
     {

-        wxLogSysError("Failed to get file system statistics");
+        wxLogSysError( wxT("Failed to get file system statistics") );

 
         return FALSE;
     }
 
         return FALSE;
     }