fixing osx_carbon

[wxWidgets.git] / src / msdos / utilsdos.cpp

diff --git a/src/msdos/utilsdos.cpp b/src/msdos/utilsdos.cpp
index 3d1095cf59da84eae22129212f47e2657651e3c6..52bfea46dad3398f48fca553274d6e3da361d943 100644 (file)
--- a/src/msdos/utilsdos.cpp
+++ b/src/msdos/utilsdos.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/msdos/utils.cpp
+// Name:        src/msdos/utilsdos.cpp

 // Purpose:     DOS implementations of utility functions
 // Author:      Vaclav Slavik, M.J.Wetherell
 // Id:          $Id$
 // Purpose:     DOS implementations of utility functions
 // Author:      Vaclav Slavik, M.J.Wetherell
 // Id:          $Id$


@@ -314,7 +314,8 @@ bool wxShell(const wxString& command /*=wxEmptyString*/)
     return result == 0;
 }
 
     return result == 0;
 }
 

-long wxExecute(const wxString& command, int flags, wxProcess *process)
+long wxExecute(const wxString& command, int flags, wxProcess *process,
+        const wxExecuteEnv *env)

 {
     // FIXME: shouldn't depend on wxCmdLineParser
     wxArrayString args(wxCmdLineParser::ConvertStringToArgs(command));
 {
     // FIXME: shouldn't depend on wxCmdLineParser
     wxArrayString args(wxCmdLineParser::ConvertStringToArgs(command));


@@ -439,7 +440,8 @@ wxString wxRedirectableFd::Release()
 
 // wxExecute implementation
 //
 
 // wxExecute implementation
 //

-long wxExecute(wxChar **argv, int flags, wxProcess *process)
+long wxExecute(wxChar **argv, int flags, wxProcess *process,
+        const wxString* cwd, const wxEnvVariableHashMap* env)

 {
 #if wxUSE_STREAMS
     const int STDIN = 0;
 {
 #if wxUSE_STREAMS
     const int STDIN = 0;