open-plc-utils: fix musl and fortify source compatibility

- Include `poll.h` at the top of `ether/readpacket.c` to avoid nested declaration errors caused by fortify source headers - Add missing `sys/select.h` include to `serial/serial.c` Signed-off-by: Jo-Philipp Wich <[email protected]>
qca · Nov 2, 2015 · ce41b2b · ce41b2b
1 parent 885a1b7
commit ce41b2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ether/readpacket.c b/ether/readpacket.c
@@ -70,6 +70,10 @@
 #include <memory.h>
 #include <errno.h>
 
+#if defined (__linux__)
+#include <poll.h>
+#endif
+
 #include "../ether/channel.h"
 #include "../tools/memory.h"
 #include "../tools/error.h"
@@ -95,8 +99,6 @@ ssize_t readpacket (struct channel const * channel, void * memory, ssize_t exten
 
 #elif defined (__linux__)
 
-#include <sys/poll.h>
-
 	struct pollfd pollfd =
 	{
 		channel->fd,

diff --git a/serial/serial.c b/serial/serial.c
@@ -69,6 +69,8 @@
 
 #if defined (WIN32)
 #include <Windows.h>
+#else
+#include <sys/select.h>
 #endif
 
 /*====================================================================*