diff --git a/src/Streams/PtyStream.cpp b/src/Streams/PtyStream.cpp index a356b88..39bb550 100644 --- a/src/Streams/PtyStream.cpp +++ b/src/Streams/PtyStream.cpp @@ -1,10 +1,7 @@ #include "TessesFramework/Streams/PtyStream.hpp" -#if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) -#if defined(__APPLE__) -#include -#else +#if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) + #include -#endif #include #include #include @@ -14,7 +11,7 @@ namespace Tesses::Framework::Streams { PtyStream::PtyStream(WindowSize windowSize,std::string filename, std::vector args, std::vector env) { - #if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) + #if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) this->wS = windowSize; this->eos=false; winsize sz; @@ -84,7 +81,7 @@ namespace Tesses::Framework::Streams { size_t PtyStream::Read(uint8_t* buff, size_t sz) { if(this->eos) return 0; - #if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) + #if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) auto res = read(this->socket, buff,sz); if(res == -1) @@ -100,7 +97,7 @@ namespace Tesses::Framework::Streams { } size_t PtyStream::Write(const uint8_t* buff, size_t sz) { - #if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) + #if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) auto res = write(this->socket, buff,sz); return res; #else @@ -113,7 +110,7 @@ namespace Tesses::Framework::Streams { } void PtyStream::Resize(WindowSize windowSize) { - #if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) + #if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) this->wS = windowSize; winsize sz; sz.ws_col =(unsigned short)windowSize.Columns; @@ -132,7 +129,7 @@ namespace Tesses::Framework::Streams { { if(this->eos) return; this->eos=true; - #if !defined(GEKKO) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) + #if !define(GEKKO) && !defined(__APPLE__) && !defined(__PS2__) && !defined(_WIN32) && !defined(__SWITCH__) && !defined(__FreeBSD__) && defined(TESSESFRAMEWORK_ENABLE_PROCESS) close(this->socket); kill((pid_t)this->pid,SIGHUP);