From 8060b07eeec31e60b3e445cd0204be35670f61c5 Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Wed, 26 Sep 2018 18:16:05 -0400 Subject: [PATCH] Fix macOS compile errors --- communication/message/callback/include/messagecallback.h | 1 + device/include/idevicesettings.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/communication/message/callback/include/messagecallback.h b/communication/message/callback/include/messagecallback.h index 9f80154..1ed7f62 100644 --- a/communication/message/callback/include/messagecallback.h +++ b/communication/message/callback/include/messagecallback.h @@ -4,6 +4,7 @@ #include "communication/message/include/message.h" #include "communication/message/filter/include/messagefilter.h" #include +#include namespace icsneo { diff --git a/device/include/idevicesettings.h b/device/include/idevicesettings.h index cf29087..5a3f2d5 100644 --- a/device/include/idevicesettings.h +++ b/device/include/idevicesettings.h @@ -277,16 +277,16 @@ typedef struct _UART_SETTINGS uint16_t stop_bits; uint8_t flow_control; /* 0- off, 1 - Simple CTS RTS */ uint8_t reserved_1; - union { + union abcd { uint32_t bOptions; - struct sOptions + struct _sOptions { unsigned invert_tx : 1; unsigned invert_rx : 1; unsigned half_duplex : 1; unsigned reserved_bits : 13; unsigned reserved_bits2 : 16; - }; + } sOptions; }; } UART_SETTINGS; #define UART_SETTINGS_SIZE 16