Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / palmos / utilsexc.cpp

diff --git a/src/palmos/utilsexc.cpp b/src/palmos/utilsexc.cpp
index eaa04a4e6b18ac9f054a3cafc40f47bc0ae55530..2d224edacbe79cea162d81b0373a90959d3fbe08 100644 (file)
--- a/src/palmos/utilsexc.cpp
+++ b/src/palmos/utilsexc.cpp
@@ -87,12 +87,14 @@ static bool wxExecuteDDE(const wxString& ddeServer,
 
 #endif // wxUSE_IPC
 
 
 #endif // wxUSE_IPC
 

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

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-long wxExecute(wxChar **argv, int flags, wxProcess *handler)
+long wxExecute(wxChar **argv, int flags, wxProcess *handler,
+    const wxExecuteEnv *env)

 {
     return 0;
 }
 {
     return 0;
 }