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 645132d1cca521365ae7f80cb10bec593ad10659..2d224edacbe79cea162d81b0373a90959d3fbe08 100644 (file)
--- a/src/palmos/utilsexc.cpp
+++ b/src/palmos/utilsexc.cpp
@@ -29,15 +29,16 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #if wxUSE_STREAMS
+        #include "wx/stream.h"
+    #endif
+    #include "wx/module.h"
 #endif
 
-#include "wx/stream.h"
 #include "wx/process.h"
 
 #include "wx/apptrait.h"
 
-#include "wx/module.h"
-
 #include <ctype.h>
 
 #include <stdio.h>
@@ -86,13 +87,14 @@ static bool wxExecuteDDE(const wxString& ddeServer,
 
 #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;
 }
 
-long wxExecute(wxChar **argv, int flags, wxProcess *handler)
+long wxExecute(wxChar **argv, int flags, wxProcess *handler,
+    const wxExecuteEnv *env)
 {
     return 0;
 }
-