diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-23 17:39:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 17:39:23 +0200 |
| commit | 6098a7f1914f64c77d689f54d5432095911b744f (patch) | |
| tree | bf07da3b3177f3d104ecb5a66a7dc24b207fb08a /drivers/unix/os_unix.h | |
| parent | b0da7b66ce278179eedd0e21dae1d84ed3f4459d (diff) | |
| parent | dd03dcbd5a1d4a23d4fb3aa41da0c91fe2c5eda5 (diff) | |
| download | redot-engine-6098a7f1914f64c77d689f54d5432095911b744f.tar.gz | |
Merge pull request #27781 from reduz/new_android_export
Android now (optionally) builds the template when exporting
Diffstat (limited to 'drivers/unix/os_unix.h')
| -rw-r--r-- | drivers/unix/os_unix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 09ab4aa1d8..6a05877a8c 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -89,7 +89,7 @@ public: virtual void delay_usec(uint32_t p_usec) const; virtual uint64_t get_ticks_usec() const; - virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false); + virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false, Mutex *p_pipe_mutex = NULL); virtual Error kill(const ProcessID &p_pid); virtual int get_process_id() const; |