From 5c26b0fe7700b425981c976cd3f483b63fc03484 Mon Sep 17 00:00:00 2001
From: Clovis Durand <cd.clovel19@gmail.com>
Date: Sat, 21 Mar 2020 19:34:56 +0100
Subject: [PATCH] Fixed RS232 code to work on macOS

Signed-off-by: Clovis Durand <cd.clovel19@gmail.com>
---
 src/rs232.c |  6 ++++--
 src/rs232.h | 10 +++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/rs232.c b/src/rs232.c
index aa0ef45..12b876f 100644
--- a/src/rs232.c
+++ b/src/rs232.c
@@ -34,7 +34,7 @@
 #include "rs232.h"
 
 
-#if defined(__linux__) || defined(__FreeBSD__)   /* Linux & FreeBSD */
+#ifndef _WIN32   /* Linux, FreeBSD, macOS */
 
 #define RS232_PORTNR  38
 
@@ -103,6 +103,7 @@ int RS232_OpenComport(int comport_number, int baudrate, const char *mode)
                    break;
     case  230400 : baudr = B230400;
                    break;
+#ifndef __APPLE__
     case  460800 : baudr = B460800;
                    break;
     case  500000 : baudr = B500000;
@@ -127,6 +128,7 @@ int RS232_OpenComport(int comport_number, int baudrate, const char *mode)
                    break;
     case 4000000 : baudr = B4000000;
                    break;
+#endif /* __APPLE__ */
     default      : printf("invalid baudrate\n");
                    return(1);
                    break;
@@ -480,7 +482,7 @@ void RS232_flushRXTX(int comport_number)
 }
 
 
-#else  /* windows */
+#else  /* _WIN32 */
 
 #define RS232_PORTNR  16
 
diff --git a/src/rs232.h b/src/rs232.h
index 80fea09..13c1edb 100644
--- a/src/rs232.h
+++ b/src/rs232.h
@@ -42,8 +42,9 @@ extern "C" {
 
 
 
-#if defined(__linux__) || defined(__FreeBSD__)
-
+#if _WIN32
+#include <windows.h>
+#else /* _WIN32 */
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
@@ -53,11 +54,6 @@ extern "C" {
 #include <limits.h>
 #include <sys/file.h>
 #include <errno.h>
-
-#else
-
-#include <windows.h>
-
 #endif
 
 int RS232_OpenComport(int, int, const char *);