OSX build error fixes

g4klx · Aug 13, 2021 · 03a4837 · 03a4837
1 parent 14bf500
commit 03a4837
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/ModemPort.h b/ModemPort.h
@@ -30,6 +30,9 @@ class IModemPort {
 	virtual int write(const unsigned char* buffer, unsigned int length) = 0;
 
 	virtual void close() = 0;
+#if defined(__APPLE__)
+	virtual int setNonblock(bool nonblock) = 0;
+#endif
 
 private:
 };

diff --git a/NullController.h b/NullController.h
@@ -35,6 +35,10 @@ class CNullController : public IModemPort {
 	virtual int write(const unsigned char* buffer, unsigned int length);
 
 	virtual void close();
+
+#if defined(__APPLE__)
+	int setNonblock(bool nonblock) { return 0; }
+#endif
 
 private:
 	CRingBuffer<unsigned char> m_buffer;

diff --git a/PseudoTTYController.cpp b/PseudoTTYController.cpp
@@ -32,7 +32,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <termios.h>
-#include <pty.h>
+#if defined(__APPLE__)
+	#include <util.h>
+#else
+	#include <pty.h>
+#endif
 
 
 CPseudoTTYController::CPseudoTTYController(const std::string& symlink, unsigned int speed, bool assertRTS) :

diff --git a/UARTController.cpp b/UARTController.cpp
@@ -328,8 +328,13 @@ bool CUARTController::setRaw()
 			::cfsetispeed(&termios, B230400);
 			break;
 		case 460800U:
-			::cfsetospeed(&termios, B460800);
-			::cfsetispeed(&termios, B460800);
+#if defined(__APPLE__)
+			::cfsetospeed(&termios, 460800);
+			::cfsetispeed(&termios, 460800);
+#else
+ 			::cfsetospeed(&termios, B460800);
+ 			::cfsetispeed(&termios, B460800);
+#endif
 			break;
 		default:
 			LogError("Unsupported serial port speed - %u", m_speed);

diff --git a/UDPController.h b/UDPController.h
@@ -37,6 +37,10 @@ class CUDPController : public IModemPort {
 	virtual int write(const unsigned char* buffer, unsigned int length);
 
 	virtual void close();
+
+#if defined(__APPLE__)
+	int setNonblock(bool nonblock) { return 0; }
+#endif
 
 protected:
 	CUDPSocket       m_socket;