Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-04-07 20:41:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Made emscripten guards consistent in SubProcessUnix.

Browse Source
This commit is contained in:
Relintai 2023-09-10 13:32:47 +02:00
parent 25533eed23
commit d9f09d86d3
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/unix/sub_process_unix.cpp
View File

@ -40,6 +40,11 @@
#include <sys/wait.h> #include <sys/wait.h>
Error SubProcessUnix::start() { Error SubProcessUnix::start() {
#ifdef __EMSCRIPTEN__
// Don't compile this code at all to avoid undefined references.
// Actual virtual call goes to OS_JavaScript.
ERR_FAIL_V(ERR_BUG);
#else
if (_executable_path.empty()) { if (_executable_path.empty()) {
return ERR_FILE_BAD_PATH; return ERR_FILE_BAD_PATH;
} }
@ -48,11 +53,6 @@ Error SubProcessUnix::start() {
return ERR_BUSY; return ERR_BUSY;
} }
#ifdef __EMSCRIPTEN__
// Don't compile this code at all to avoid undefined references.
// Actual virtual call goes to OS_JavaScript.
ERR_FAIL_V(ERR_BUG);
#else
if (_blocking && _read_output) { if (_blocking && _read_output) {
String argss; String argss;
argss = "\"" + _executable_path + "\""; argss = "\"" + _executable_path + "\"";
@ -155,6 +155,11 @@ Error SubProcessUnix::start() {
} }
Error SubProcessUnix::stop() { Error SubProcessUnix::stop() {
#ifdef __EMSCRIPTEN__
// Don't compile this code at all to avoid undefined references.
// Actual virtual call goes to OS_JavaScript.
ERR_FAIL_V(ERR_BUG);
#else
if (_process_fp) { if (_process_fp) {
int rv = pclose(_process_fp); int rv = pclose(_process_fp);
_process_fp = NULL; _process_fp = NULL;
@ -178,6 +183,7 @@ Error SubProcessUnix::stop() {
} }
ERR_FAIL_V(ERR_BUG); ERR_FAIL_V(ERR_BUG);
#endif
} }
Error SubProcessUnix::poll() { Error SubProcessUnix::poll() {
@ -219,6 +225,12 @@ Error SubProcessUnix::send_data(const String &p_data) {
} }
bool SubProcessUnix::is_process_running() const { bool SubProcessUnix::is_process_running() const {
#ifdef __EMSCRIPTEN__
// Don't compile this code at all to avoid undefined references.
// Actual virtual call goes to OS_JavaScript.
ERR_FAIL_V(false);
#else
if (_process_fp) { if (_process_fp) {
return !feof(_process_fp); return !feof(_process_fp);
} }
@ -233,9 +245,11 @@ bool SubProcessUnix::is_process_running() const {
} }
return true; return true;
#endif
} }
SubProcessUnix::SubProcessUnix() : SubProcess() { SubProcessUnix::SubProcessUnix() :
SubProcess() {
_process_fp = NULL; _process_fp = NULL;
} }
SubProcessUnix::~SubProcessUnix() { SubProcessUnix::~SubProcessUnix() {