OSX build error fixes
This commit is contained in:
parent
14bf5007d5
commit
03a4837227
|
@ -30,6 +30,9 @@ public:
|
||||||
virtual int write(const unsigned char* buffer, unsigned int length) = 0;
|
virtual int write(const unsigned char* buffer, unsigned int length) = 0;
|
||||||
|
|
||||||
virtual void close() = 0;
|
virtual void close() = 0;
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
virtual int setNonblock(bool nonblock) = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
};
|
};
|
||||||
|
|
|
@ -35,6 +35,10 @@ public:
|
||||||
virtual int write(const unsigned char* buffer, unsigned int length);
|
virtual int write(const unsigned char* buffer, unsigned int length);
|
||||||
|
|
||||||
virtual void close();
|
virtual void close();
|
||||||
|
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
int setNonblock(bool nonblock) { return 0; }
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CRingBuffer<unsigned char> m_buffer;
|
CRingBuffer<unsigned char> m_buffer;
|
||||||
|
|
|
@ -32,7 +32,11 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <termios.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) :
|
CPseudoTTYController::CPseudoTTYController(const std::string& symlink, unsigned int speed, bool assertRTS) :
|
||||||
|
|
|
@ -328,8 +328,13 @@ bool CUARTController::setRaw()
|
||||||
::cfsetispeed(&termios, B230400);
|
::cfsetispeed(&termios, B230400);
|
||||||
break;
|
break;
|
||||||
case 460800U:
|
case 460800U:
|
||||||
::cfsetospeed(&termios, B460800);
|
#if defined(__APPLE__)
|
||||||
::cfsetispeed(&termios, B460800);
|
::cfsetospeed(&termios, 460800);
|
||||||
|
::cfsetispeed(&termios, 460800);
|
||||||
|
#else
|
||||||
|
::cfsetospeed(&termios, B460800);
|
||||||
|
::cfsetispeed(&termios, B460800);
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
LogError("Unsupported serial port speed - %u", m_speed);
|
LogError("Unsupported serial port speed - %u", m_speed);
|
||||||
|
|
|
@ -37,6 +37,10 @@ public:
|
||||||
virtual int write(const unsigned char* buffer, unsigned int length);
|
virtual int write(const unsigned char* buffer, unsigned int length);
|
||||||
|
|
||||||
virtual void close();
|
virtual void close();
|
||||||
|
|
||||||
|
#if defined(__APPLE__)
|
||||||
|
int setNonblock(bool nonblock) { return 0; }
|
||||||
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
CUDPSocket m_socket;
|
CUDPSocket m_socket;
|
||||||
|
|
Loading…
Reference in New Issue