diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-12 16:17:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 16:17:04 +0100 |
| commit | 1218441b16bd0d5bdbcf93c11e77f1e999f0183c (patch) | |
| tree | 4c3f84ce756631822207ce73d4f7879fa789be69 /drivers/unix/os_unix.h | |
| parent | 3bce846e0cdc172b8cb17370c5354dc61890bf91 (diff) | |
| parent | 2a74b388d0e228dc1b890a3ed2529dbec23ecf30 (diff) | |
Merge pull request #44514 from madmiraal/split-os-execute
Split OS::execute into two methods
Diffstat (limited to 'drivers/unix/os_unix.h')
| -rw-r--r-- | drivers/unix/os_unix.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 7d1f1c82c2..6c79d984e9 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -82,7 +82,8 @@ public: virtual void delay_usec(uint32_t p_usec) const override; virtual uint64_t get_ticks_usec() const override; - virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking = true, ProcessID *r_child_id = nullptr, String *r_pipe = nullptr, int *r_exitcode = nullptr, bool read_stderr = false, Mutex *p_pipe_mutex = nullptr) override; + virtual Error execute(const String &p_path, const List<String> &p_arguments, String *r_pipe = nullptr, int *r_exitcode = nullptr, bool read_stderr = false, Mutex *p_pipe_mutex = nullptr) override; + virtual Error create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id = nullptr) override; virtual Error kill(const ProcessID &p_pid) override; virtual int get_process_id() const override; |